Skip to content

Commit 9c5193b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into wi236734-copilot-in-mdc
2 parents e5e14dc + a308812 commit 9c5193b

16 files changed

+162
-110
lines changed

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

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ Follow the steps in this section to instrument your application with OpenTelemet
4646

4747
- A Java application using Java 8+
4848

49+
### [Java Native](#tab/java-native)
50+
51+
- A Java application using GraalVM 17+
52+
4953
### [Node.js](#tab/nodejs)
5054

5155
> [!NOTE]
@@ -65,15 +69,15 @@ Follow the steps in this section to instrument your application with OpenTelemet
6569

6670
#### [ASP.NET Core](#tab/aspnetcore)
6771

68-
Install the latest [Azure.Monitor.OpenTelemetry.AspNetCore](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore) NuGet package:
72+
Install the latest `Azure.Monitor.OpenTelemetry.AspNetCore` [NuGet package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore):
6973

7074
```dotnetcli
7175
dotnet add package Azure.Monitor.OpenTelemetry.AspNetCore
7276
```
7377

7478
### [.NET](#tab/net)
7579

76-
Install the latest [Azure.Monitor.OpenTelemetry.Exporter](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter) NuGet package:
80+
Install the latest `Azure.Monitor.OpenTelemetry.Exporter` [NuGet package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter):
7781

7882
```dotnetcli
7983
dotnet add package Azure.Monitor.OpenTelemetry.Exporter
@@ -92,6 +96,17 @@ Download the [applicationinsights-agent-3.5.3.jar](https://github.com/microsoft/
9296
> [3.2.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.2.0), and
9397
> [3.1.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.1.0)
9498
99+
100+
#### [Java Native](#tab/java-native)
101+
102+
For Spring Boot native applications:
103+
* [Import the OpenTelemetry Bills of Materials (BOM)](https://opentelemetry.io/docs/zero-code/java/spring-boot-starter/getting-started/).
104+
* Add the [Spring Cloud Azure Starter Monitor](https://mvnrepository.com/artifact/com.azure.spring/cloud-starter-azure-monitor) dependency.
105+
* Follow [these instructions](/azure//developer/java/spring-framework/developer-guide-overview#configuring-spring-boot-3) for the Azure SDK JAR (Java Archive) files.
106+
107+
For Quarkus native applications:
108+
* Add the [Quarkus OpenTelemetry Exporter for Azure](https://mvnrepository.com/artifact/io.quarkiverse.opentelemetry.exporter/quarkus-opentelemetry-exporter-azure) dependency.
109+
95110
#### [Node.js](#tab/nodejs)
96111

97112
Install these packages:
@@ -202,6 +217,11 @@ Point the Java virtual machine (JVM) to the jar file by adding `-javaagent:"path
202217
> [!TIP]
203218
> If you develop a Spring Boot application, you can optionally replace the JVM argument by a programmatic configuration. For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
204219
220+
221+
##### [Java-Native](#tab/java-native)
222+
223+
Several automatic instrumentations are enabled through configuration changes; no code changes are required
224+
205225
##### [Node.js](#tab/nodejs)
206226

207227
```typescript
@@ -222,7 +242,7 @@ from azure.monitor.opentelemetry import configure_azure_monitor
222242
# Import the tracing api from the `opentelemetry` package.
223243
from opentelemetry import trace
224244

225-
# Configure OpenTelemetry to use Azure Monitor with the 
245+
# Configure OpenTelemetry to use Azure Monitor with the
226246
# APPLICATIONINSIGHTS_CONNECTION_STRING environment variable.
227247
configure_azure_monitor()
228248

@@ -307,6 +327,10 @@ Azure Monitor OpenTelemetry sample applications are available for all supported
307327

308328
- [Java sample apps](https://github.com/Azure-Samples/ApplicationInsights-Java-Samples)
309329

330+
##### [Java Native](#tab/java-native)
331+
332+
- [Java GraalVM native sample apps](https://github.com/Azure-Samples/java-native-telemetry)
333+
310334
##### [Node.js](#tab/nodejs)
311335

312336
- [Node.js sample app](https://github.com/Azure-Samples/azure-monitor-opentelemetry-node.js)
@@ -341,12 +365,20 @@ Azure Monitor OpenTelemetry sample applications are available for all supported
341365

342366
### [Java](#tab/java)
343367

344-
- For details on adding and modifying Azure Monitor OpenTelemetry, see [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md).
368+
- See [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md) for details on adding and modifying Azure Monitor OpenTelemetry.
345369
- Review [Java autoinstrumentation configuration options](java-standalone-config.md).
346-
- To review the source code, see the [Azure Monitor Java autoinstrumentation GitHub repository](https://github.com/Microsoft/ApplicationInsights-Java).
347-
- To learn more about OpenTelemetry and its community, see the [OpenTelemetry Java GitHub repository](https://github.com/open-telemetry/opentelemetry-java-instrumentation).
348-
- To enable usage experiences, see [Enable web or browser user monitoring](javascript.md).
349-
- See the [release notes](https://github.com/microsoft/ApplicationInsights-Java/releases) on GitHub.
370+
- Review the source code in the [Azure Monitor Java autoinstrumentation GitHub repository](https://github.com/Microsoft/ApplicationInsights-Java).
371+
- Learn more about OpenTelemetry and its community in the [OpenTelemetry Java GitHub repository](https://github.com/open-telemetry/opentelemetry-java-instrumentation).
372+
- Enable usage experiences by seeing [Enable web or browser user monitoring](javascript.md).
373+
- Review the [release notes](https://github.com/microsoft/ApplicationInsights-Java/releases) on GitHub.
374+
375+
### [Java Native](#tab/java-native)
376+
- See [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md) for details on adding and modifying Azure Monitor OpenTelemetry.
377+
- Review the source code in the [Azure Monitor OpenTelemetry Distro in Spring Boot native image Java application](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/spring-cloud-azure-starter-monitor) and [Quarkus OpenTelemetry Exporter for Azure](https://github.com/quarkiverse/quarkus-opentelemetry-exporter/tree/main/quarkus-opentelemetry-exporter-azure).
378+
- Learn more about OpenTelemetry and its community in the [OpenTelemetry Java GitHub repository](https://github.com/open-telemetry/opentelemetry-java-instrumentation).
379+
- Learn more features for Spring Boot native image applications in [OpenTelemetry SpringBoot starter](https://opentelemetry.io/docs/zero-code/java/spring-boot-starter/.)
380+
- Learn more features for Quarkus native applications in [Quarkus OpenTelemetry Exporter for Azure](https://quarkus.io/guides/opentelemetry).
381+
- Review the [release notes](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/spring-cloud-azure-starter-monitor/CHANGELOG.md) on GitHub.
350382

351383
### [Node.js](#tab/nodejs)
352384

@@ -359,18 +391,18 @@ Azure Monitor OpenTelemetry sample applications are available for all supported
359391

360392
### [Python](#tab/python)
361393

362-
- For details on adding and modifying Azure Monitor OpenTelemetry, see [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md).
363-
- To review the source code and extra documentation, see the [Azure Monitor Distro GitHub repository](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry/README.md).
364-
- To see extra samples and use cases, see [Azure Monitor Distro samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-opentelemetry/samples).
365-
- See the [changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md) on GitHub.
366-
- To install the PyPI package, check for updates, or view release notes, see the [Azure Monitor Distro PyPI Package](https://pypi.org/project/azure-monitor-opentelemetry/) page.
367-
- To become more familiar with Azure Monitor Application Insights and OpenTelemetry, see the [Azure Monitor Example Application](https://github.com/Azure-Samples/azure-monitor-opentelemetry-python).
368-
- To learn more about OpenTelemetry and its community, see the [OpenTelemetry Python GitHub repository](https://github.com/open-telemetry/opentelemetry-python).
369-
- To see available OpenTelemetry instrumentations and components, see the [OpenTelemetry Contributor Python GitHub repository](https://github.com/open-telemetry/opentelemetry-python-contrib).
370-
- To enable usage experiences, [enable web or browser user monitoring](javascript.md).
394+
- See [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md) for details on adding and modifying Azure Monitor OpenTelemetry.
395+
- Review the source code and extra documentation in the [Azure Monitor Distro GitHub repository](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry/README.md).
396+
- See extra samples and use cases in [Azure Monitor Distro samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-opentelemetry/samples).
397+
- Review the [changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md) on GitHub.
398+
- Install the PyPI package, check for updates, or view release notes on the [Azure Monitor Distro PyPI Package](https://pypi.org/project/azure-monitor-opentelemetry/) page.
399+
- Become more familiar with Azure Monitor Application Insights and OpenTelemetry in the [Azure Monitor Example Application](https://github.com/Azure-Samples/azure-monitor-opentelemetry-python).
400+
- Learn more about OpenTelemetry and its community in the [OpenTelemetry Python GitHub repository](https://github.com/open-telemetry/opentelemetry-python).
401+
- See available OpenTelemetry instrumentations and components in the [OpenTelemetry Contributor Python GitHub repository](https://github.com/open-telemetry/opentelemetry-python-contrib).
402+
- Enable usage experiences by [enabling web or browser user monitoring](javascript.md).
371403

372404
---
373405

374406
[!INCLUDE [azure-monitor-app-insights-opentelemetry-faqs](../includes/azure-monitor-app-insights-opentelemetry-faqs.md)]
375407

376-
[!INCLUDE [azure-monitor-app-insights-opentelemetry-support](../includes/azure-monitor-app-insights-opentelemetry-support.md)]
408+
[!INCLUDE [azure-monitor-app-insights-opentelemetry-support](../includes/azure-monitor-app-insights-opentelemetry-support.md)]

articles/azure-monitor/essentials/diagnostics-settings-policies-deployifnotexists.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,9 @@ The following table describes the common parameters for each set of policies.
357357
|Parameter| Description| Valid Values|Default|
358358
|---|---|---|---|
359359
|effect| Enable or disable the execution of the policy|DeployIfNotExists,<br>AuditIfNotExists,<br>Disabled|DeployIfNotExists|
360-
|diagnosticSettingName|Diagnostic Setting Name||setByPolicy-LogAnalytics|
360+
|diagnosticSettingName|Diagnostic Setting Name||setByPolicy-{LogAnalytics\|EventHubs\|Storage}|
361361
|categoryGroup|Diagnostic category group|none,<br>audit,<br>allLogs|audit|
362+
|resourceTypeList|For initiatives, a list of resource types to be evaluated for diagnostic setting existence.|Supported resources|All supported resources|
362363
363364
## Policy-specific parameters
364365
### Log Analytics policy parameters

articles/backup/enable-multi-user-authorization-quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Quickstart - Multi-user authorization using Resource Guard
33
description: In this quickstart, learn how to use Multi-user authorization to protect against unauthorized operation.
44
ms.topic: quickstart
5-
ms.date: 09/25/2023
5+
ms.date: 06/11/2024
66
ms.service: backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -28,15 +28,15 @@ Before you start:
2828
# [Recovery Services vault](#tab/recovery-services-vault)
2929

3030
- Ensure the Resource Guard and the Recovery Services vault are in the same Azure region.
31-
- Ensure the Backup admin does **not** have **Contributor** permissions on the Resource Guard. You can choose to have the Resource Guard in another subscription of the same directory or in another directory to ensure maximum isolation.
31+
- Ensure the **Backup admin** doesn't have **Contributor**, **Backup MUA Admin**, or **Backup MUA Operator** roles added on the Resource Guard. You can choose to have the Resource Guard in another subscription of the same directory or in another directory to ensure maximum isolation.
3232
- Ensure that your subscriptions containing the Recovery Services vault as well as the Resource Guard (in different subscriptions or tenants) are registered to use the **Microsoft.RecoveryServices** provider. For more details, see [Azure resource providers and types](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider-1).
3333
- Ensure that you [create a Resource Guard](multi-user-authorization.md#create-a-resource-guard) in a different subsctiption/tenant as that of the vault located in the same region.
3434
- Ensure to [assign permissions to the Backup admin on the Resource Guard to enable MUA](multi-user-authorization.md#assign-permissions-to-the-backup-admin-on-the-resource-guard-to-enable-mua).
3535

3636
# [Backup vault](#tab/backup-vault)
3737

3838
- Ensure the Resource Guard and the Backup vault are in the same Azure region.
39-
- Ensure the Backup admin does **not** have **Contributor** permissions on the Resource Guard. You can choose to have the Resource Guard in another subscription of the same directory or in another directory to ensure maximum isolation.
39+
- Ensure the **Backup admin** doesn't have **Contributor**, **Backup MUA Admin**, or **Backup MUA Operator** roles added on the Resource Guard. You can choose to have the Resource Guard in another subscription of the same directory or in another directory to ensure maximum isolation.
4040
- Ensure that your subscriptions contain the Backup vault as well as the Resource Guard (in different subscriptions or tenants) are registered to use the provider - **Microsoft.DataProtection**4. For more information, see [Azure resource providers and types](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider-1).
4141

4242
---
-136 KB
Loading

articles/backup/multi-user-authorization-concept.md

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Multi-user authorization using Resource Guard
33
description: An overview of Multi-user authorization using Resource Guard.
44
ms.topic: conceptual
5-
ms.date: 03/26/2024
5+
ms.date: 06/11/2024
66
ms.service: backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -19,7 +19,7 @@ Multi-user authorization (MUA) for Azure Backup allows you to add an additional
1919
Azure Backup uses the Resource Guard as an additional authorization mechanism for a Recovery Services vault or a Backup vault. Therefore, to perform a critical operation (described below) successfully, you must have sufficient permissions on the associated Resource Guard as well.
2020

2121
> [!Important]
22-
> To function as intended, the Resource Guard must be owned by a different user, and the vault admin must not have Contributor permissions. You can place Resource Guard in a subscription or tenant different from the one containing the vaults to provide better protection.
22+
> To function as intended, the Resource Guard must be owned by a different user, and the **vault admin** mustn't have **Contributor**, **Backup MUA Admin**, or **Backup MUA Operator** permissions on the Resource Guard. You can place Resource Guard in a subscription or tenant different from the one containing the vaults to provide better protection.
2323
2424
## Critical operations
2525

@@ -32,21 +32,29 @@ The following table lists the operations defined as critical operations and can
3232

3333
# [Recovery Services vault](#tab/recovery-services-vault)
3434

35-
**Operation** | **Mandatory/ Optional**
36-
--- | ---
37-
Disable soft delete | Mandatory
38-
Disable MUA protection | Mandatory
39-
Modify backup policy (reduced retention) | Optional
40-
Modify protection (reduced retention) | Optional
41-
Stop protection with delete data | Optional
42-
Change MARS security PIN | Optional
35+
| Operation | Mandatory/ Optional | Description |
36+
| --- | --- | --- |
37+
| **Disable soft delete or security features** | Mandatory | Disable soft delete setting on a vault. |
38+
| **Remove MUA protection** | Mandatory | Disable MUA protection on a vault. |
39+
| **Delete protection** | Optional | Delete protection by stopping backups and performing delete data. |
40+
| **Modify protection** | Optional | Add a new backup policy with reduced retention or change policy frequency to increase [RPO](azure-backup-glossary.md#recovery-point-objective-rpo). |
41+
| **Modify policy** | Optional | Modify backup policy to reduce retention or change policy frequency to increase [RPO](azure-backup-glossary.md#recovery-point-objective-rpo). |
42+
| **Get backup security PIN** | Optional | Change MARS security PIN. |
43+
| **Stop backup and retain data** | Optional | Delete protection by stopping backups and performing retain data forever or retain as per policy. |
44+
| **Disable immutability** | Optional | Disable immutability setting on a vault. |
45+
4346

4447
# [Backup vault](#tab/backup-vault)
4548

46-
**Operation** | **Mandatory/ Optional**
47-
--- | ---
48-
Disable MUA protection | Mandatory
49-
Delete backup instance | Optional
49+
| Operation | Mandatory/ Optional | Description |
50+
| --- | --- | --- |
51+
| **Disable soft delete** | Mandatory | Disable soft delete setting on a vault. |
52+
| **Remove MUA protection** | Mandatory | Disable MUA protection on a vault. |
53+
| **Delete Backup Instance** | Optional | Delete protection by stopping backups and performing delete data. |
54+
| **Stop backup and retain forever** | Optional | Delete protection by stopping backups and performing retain data forever. |
55+
| **Stop backup and retain as per policy** | Optional | Delete protection by stopping backups and performing retain data as per policy. |
56+
| **Disable immutability** | Optional | Disable immutability setting on a vault. |
57+
5058

5159
---
5260

@@ -69,7 +77,7 @@ Here's the flow of events in a typical scenario:
6977
1. The Backup admin creates the Recovery Services vault or the Backup vault.
7078
2. The Security admin creates the Resource Guard.
7179

72-
The Resource Guard can be in a different subscription or a different tenant with respect to the vault. Ensure that the Backup admin doesn't have Contributor permissions on the Resource Guard.
80+
The Resource Guard can be in a different subscription or a different tenant with respect to the vault. Ensure that the Backup admin doesn't have **Contributor**, **Backup MUA Admin**, or **Backup MUA Operator** permissions on the Resource Guard.
7381

7482
3. The Security admin grants the Reader role to the Backup Admin for the Resource Guard (or a relevant scope). The Backup admin requires the reader role to enable MUA on the vault.
7583
4. The Backup admin now configures the vault to be protected by MUA via the Resource Guard.
@@ -81,15 +89,15 @@ Here's the flow of events in a typical scenario:
8189

8290

8391
>[!Note]
84-
>- If you grant the **Contributor** role on the Resource Guard access temporarily to the Backup Admin, it also provides the delete permissions on the Resource Guard. We recommend you to provide **Backup MUA Operator** permissions only.
92+
>- If you grant the **Contributor** or **Backup MUA Admin** role on the Resource Guard access temporarily to the Backup Admin, it also provides the delete permissions on the Resource Guard. We recommend you to provide **Backup MUA Operator** permissions only.
8593
>- MUA provides protection on the above listed operations performed on the vaulted backups only. Any operations performed directly on the data source (that is, the Azure resource/workload that is protected) are beyond the scope of the Resource Guard.
8694
8795
## Usage scenarios
8896

8997
The following table lists the scenarios for creating your Resource Guard and vaults (Recovery Services vault and Backup vault), along with the relative protection offered by each.
9098

9199
>[!Important]
92-
> The Backup admin must not have Contributor permissions to the Resource Guard in any scenario.
100+
> The **Backup admin** must not have **Contributor**, **Backup MUA Admin**, or **Backup MUA Operator** permissions to the Resource Guard in any scenario as this overrides adding MUA protection on the vault.
93101
94102
**Usage scenario** | **Protection due to MUA** | **Ease of implementation** | **Notes**
95103
--- | --- |--- |--- |

0 commit comments

Comments
 (0)