Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdclassicretirement

Author: duongau

articles/advisor/toc.yml

@@ -44,6 +44,8 @@
   items:
   - name: Use Azure Well Architected Framework Assessments
     href: advisor-assessments.md
+  - name: Use Azure Advisor resiliency reviews
+    href: advisor-resiliency-reviews.md
   - name: Optimize virtual machine spend by resizing or shutting down underutilized instances
     href: advisor-cost-recommendations.md
   - name: Optimize your Azure costs using the cost optimization workbook 

articles/app-service/configure-ssl-certificate.md

@@ -134,7 +134,7 @@ If you use Azure Key Vault to manage your certificates, you can import a PKCS12
 By default, the App Service resource provider doesn't have access to your key vault. To use a key vault for a certificate deployment, you must [authorize read access for the resource provider to the key vault](../key-vault/general/assign-access-policy-cli.md). 
 
 > [!NOTE]
-> Currently, a Key Vault certificate supports only the Key Vault access policy, not RBAC model.
+> Currently, the Azure portal does not allow you to configure an App Service certificate in Key Vault to use the RBAC model. You can, however, use Azure CLI, Azure PowerShell, or an ARM template deployment to perform this configuration.  For more information, see [Provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control](../key-vault/general/rbac-guide.md?tabs=azure-cli).
 
 | Resource provider | Service principal AppId | Key vault secret permissions | Key vault certificate permissions |
 |--|--|--|--|

articles/azure-monitor/app/opentelemetry-add-modify.md

@@ -1725,17 +1725,9 @@ Adding one or more span attributes populates the `customDimensions` field in the
 ```typescript
 // Import the necessary packages.
 const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
-const { trace, ProxyTracerProvider } = require("@opentelemetry/api");
 const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
-const { NodeTracerProvider } = require("@opentelemetry/sdk-trace-node");
 const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
 
-// Enable Azure Monitor integration.
-useAzureMonitor();
-
-// Get the NodeTracerProvider instance.
-const tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate() as NodeTracerProvider);
-
 // Create a new SpanEnrichingProcessor class.
 class SpanEnrichingProcessor implements SpanProcessor {
   forceFlush(): Promise<void> {
@@ -1755,8 +1747,13 @@ class SpanEnrichingProcessor implements SpanProcessor {
   }
 }
 
-// Add the SpanEnrichingProcessor instance to the NodeTracerProvider instance.
-tracerProvider.addSpanProcessor(new SpanEnrichingProcessor());
+// Enable Azure Monitor integration.
+const options: AzureMonitorOpenTelemetryOptions = {
+    // Add the SpanEnrichingProcessor
+    spanProcessors: [new SpanEnrichingProcessor()] 
+}
+useAzureMonitor(options);
+
 ```
 
 ##### [Python](#tab/python)
@@ -1960,29 +1957,27 @@ Logback, Log4j, and java.util.logging are [autoinstrumented](#logs). Attaching c
 #### [Node.js](#tab/nodejs)
 
 ```typescript
-    // Import the useAzureMonitor function and the logs module from the @azure/monitor-opentelemetry and @opentelemetry/api-logs packages, respectively.
     const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
-    const { logs } = require("@opentelemetry/api-logs");
-    import { Logger } from "@opentelemetry/sdk-logs";
+    const bunyan = require('bunyan');
 
-    // Enable Azure Monitor integration.
-    useAzureMonitor();
+    // Instrumentations configuration
+    const options: AzureMonitorOpenTelemetryOptions = {
+        instrumentationOptions: {
+            // Instrumentations generating logs
+            bunyan: { enabled: true },
+        }
+    };
 
-    // Get the logger for the "testLogger" logger name.
-    const logger = (logs.getLogger("testLogger") as Logger);
+    // Enable Azure Monitor integration
+    useAzureMonitor(options);
 
-    // Create a new log record.
-    const logRecord = {
-      body: "testEvent",
-      attributes: {
+    var log = bunyan.createLogger({ name: 'testApp' });
+    log.info({
         "testAttribute1": "testValue1",
         "testAttribute2": "testValue2",
         "testAttribute3": "testValue3"
-      }
-    };
+    }, 'testEvent');
 
-    // Emit the log record.
-    logger.emit(logRecord);
 ```
 
 #### [Python](#tab/python)
@@ -2147,18 +2142,28 @@ See [sampling overrides](java-standalone-config.md#sampling-overrides-preview) a
 Use the add [custom property example](#add-a-custom-property-to-a-span), but replace the following lines of code:
 
     ```typescript
-    // Import the SpanKind and TraceFlags classes from the @opentelemetry/api package.
+    // Import the necessary packages.
     const { SpanKind, TraceFlags } = require("@opentelemetry/api");
+    const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
 
     // Create a new SpanEnrichingProcessor class.
-    class SpanEnrichingProcessor {
+    class SpanEnrichingProcessor implements SpanProcessor {
+        forceFlush(): Promise<void> {
+            return Promise.resolve();
+        }
 
-      onEnd(span) {
-        // If the span is an internal span, set the trace flags to NONE.
-        if(span.kind == SpanKind.INTERNAL){
-          span.spanContext().traceFlags = TraceFlags.NONE;
+        shutdown(): Promise<void> {
+            return Promise.resolve();
+        }
+
+        onStart(_span: Span): void {}
+
+        onEnd(span) {
+            // If the span is an internal span, set the trace flags to NONE.
+            if(span.kind == SpanKind.INTERNAL){
+            span.spanContext().traceFlags = TraceFlags.NONE;
+            }
         }
-      }
     }
     ```
 

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

@@ -783,22 +783,18 @@ For more information about Java, see the [Java supplemental documentation](java-
     ```typescript
     // Import the useAzureMonitor function, the AzureMonitorOpenTelemetryOptions class, the trace module, the ProxyTracerProvider class, the BatchSpanProcessor class, the NodeTracerProvider class, and the OTLPTraceExporter class from the @azure/monitor-opentelemetry, @opentelemetry/api, @opentelemetry/sdk-trace-base, @opentelemetry/sdk-trace-node, and @opentelemetry/exporter-trace-otlp-http packages, respectively.
     const { useAzureMonitor, AzureMonitorOpenTelemetryOptions } = require("@azure/monitor-opentelemetry");
-    const { trace, ProxyTracerProvider } = require("@opentelemetry/api");
     const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-    const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
     const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
 
-    // Enable Azure Monitor integration.
-    useAzureMonitor();
-
     // Create a new OTLPTraceExporter object.
     const otlpExporter = new OTLPTraceExporter();
 
-    // Get the NodeTracerProvider instance.
-    const tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate() as NodeTracerProvider);
-
-    // Add a BatchSpanProcessor to the NodeTracerProvider instance.
-    tracerProvider.addSpanProcessor(new BatchSpanProcessor(otlpExporter));
+    // Enable Azure Monitor integration.
+    const options: AzureMonitorOpenTelemetryOptions = {
+        // Add the SpanEnrichingProcessor
+        spanProcessors: [new BatchSpanProcessor(otlpExporter)] 
+    }
+    useAzureMonitor(options);
     ```
 
 #### [Python](#tab/python)

articles/azure-vmware/media/vrealize-operations-manager/aria-operations-deployment-option-1.png

@@ -1,68 +1,64 @@
 ---
-title: Configure vRealize Operations for Azure VMware Solution
-description: Learn how to set up vRealize Operations for your Azure VMware Solution private cloud.
+title: Configure VMware Aria Operations for Azure VMware Solution
+description: Learn how to set up VMware Aria Operations for your Azure VMware Solution private cloud.
 ms.topic: how-to
 ms.service: azure-vmware
-ms.date: 12/20/2023
+ms.date: 3/18/2024
 ms.custom: engagement-fy23
 ---
 
-# Configure vRealize Operations for Azure VMware Solution
+# Configure Aria Operations for Azure VMware Solution
 
-vRealize Operations is an operations management platform that allows VMware infrastructure administrators to monitor system resources. These system resources could be application-level or infrastructure level (both physical and virtual) objects. Most VMware administrators use vRealize Operations to monitor and manage the VMware private cloud components – vCenter Server, ESXi, NSX-T Data Center, vSAN, and VMware HCX. Each provisioned Azure VMware Solution private cloud includes a dedicated vCenter Server, NSX-T Data Center, vSAN, and HCX deployment.
+Aria Operations is an operations management platform that allows VMware infrastructure administrators to monitor system resources. These system resources could be application-level or infrastructure level (both physical and virtual) objects. Most VMware administrators use Aria Operations to monitor and manage their VMware private cloud components – vCenter Server, ESXi, NSX, vSAN, and VMware HCX. Each provisioned Azure VMware Solution private cloud includes a dedicated vCenter Server, NSX Manager, vSAN, and HCX deployment.
 
-Thoroughly review [Before you begin](#before-you-begin) and [Prerequisites](#prerequisites) first. Then, we walk you through the two typical deployment topologies:
-
-> [!div class="checklist"]
-> * [On-premises vRealize Operations managing Azure VMware Solution deployment](#on-premises-vrealize-operations-managing-azure-vmware-solution-deployment)
-> * [vRealize Operations Cloud managing Azure VMware Solution deployment](#vrealize-operations-cloud-managing-azure-vmware-solution-deployment)
+Thoroughly review [Before you begin](#before-you-begin) and [Prerequisites](#prerequisites) first.
 
 ## Before you begin
-* Review the [vRealize Operations Manager product documentation](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.vapp.doc/GUID-7FFC61A0-7562-465C-A0DC-46D092533984.html) to learn more about deploying vRealize Operations.
+* Review the [Aria Operations product documentation](https://docs.vmware.com/en/VMware-Aria-Operations/index.html) to learn more about deploying Aria Operations.
 * Review the basic Azure VMware Solution Software-Defined Datacenter (SDDC) [tutorial series](tutorial-network-checklist.md).
-* Optionally, review the [vRealize Operations Remote Controller](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.vapp.doc/GUID-263F9219-E801-4383-8A59-E84F3D01ED6B.html) product documentation for the on-premises vRealize Operations managing Azure VMware Solution deployment option.
+* Optionally, review the [Aria Operations Remote Collector Nodes](https://docs.vmware.com/en/VMware-Aria-Operations/8.14/Getting-Started-Operations/GUID-263F9219-E801-4383-8A59-E84F3D01ED6B.html) product documentation for the on-premises Aria Operations managing Azure VMware Solution deployment option.
 
 ## Prerequisites
-* [vRealize Operations Manager](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.vapp.doc/GUID-7FFC61A0-7562-465C-A0DC-46D092533984.html) installed.
-* A VPN or an Azure ExpressRoute configured between on-premises and Azure VMware Solution SDDC.
+* [Aria Operations](https://docs.vmware.com/en/VMware-Aria-Operations/8.14/Getting-Started-Operations/GUID-69F7FAD8-3152-4376-9171-2208D6C9FA3A.html) is installed.
 * An Azure VMware Solution private cloud is deployed in Azure.
+* A VPN or an Azure ExpressRoute configured between on-premises and Azure VMware Solution private cloud.
 
-## On-premises vRealize Operations managing Azure VMware Solution deployment
-Most customers have an existing on-premises deployment of vRealize Operations to manage one or more on-premises vCenter Server domains. When they provision an Azure VMware Solution private cloud, they connect their on-premises environment with their private cloud using an Azure ExpressRoute or a Layer 3 VPN solution.
+## On-premises Aria Operations managing Azure VMware Solution deployment
+Most customers have an existing on-premises deployment of Aria Operations to manage one or more on-premises vCenter Server SSO domains. When they provision an Azure VMware Solution private cloud, they connect their on-premises environment with their private cloud using an Azure ExpressRoute or a Layer 3 VPN solution.
 
-:::image type="content" source="media/vrealize-operations-manager/vrealize-operations-deployment-option-1.png" alt-text="Diagram showing the on-premises vRealize Operations managing Azure VMware Solution deployment." border="false":::
+:::image type="content" source="media/vrealize-operations-manager/aria-operations-deployment-option-1.png" alt-text="Diagram showing the on-premises Aria Operations managing the Azure VMware Solution deployment." border="false" lightbox="media/vrealize-operations-manager/aria-operations-deployment-option-1.png":::
 
-To extend the vRealize Operations capabilities to the Azure VMware Solution private cloud, you create an adapter [instance for the private cloud resources](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.config.doc/GUID-640AD750-301E-4D36-8293-1BFEB67E2600.html). It collects data from the Azure VMware Solution private cloud and brings it into on-premises vRealize Operations. The on-premises vRealize Operations Manager instance can directly connect to the vCenter Server and NSX-T Manager on Azure VMware Solution. Optionally, you can deploy a vRealize Operations Remote Collector on the Azure VMware Solution private cloud. The collector compresses and encrypts the data collected from the private cloud before it's sent over the ExpressRoute or VPN network to the vRealize Operations Manager running on-premises.
+To extend the Aria Operations capabilities to the Azure VMware Solution private cloud, you create an adapter [instance for the private cloud resources](https://docs.vmware.com/en/VMware-Aria-Operations/8.16/Configuring-Operations/GUID-6CDFEDDC-A72C-4AB4-B8E8-84542CC6CE27.html). It collects data from the Azure VMware Solution private cloud and brings it into the on-premises Aria Operations. The on-premises Aria Operations instance can directly connect to the vCenter Server and NSX Manager of the Azure VMware Solution. Optionally, you can deploy an Aria Operations Remote Collector in the Azure VMware Solution private cloud. The collector compresses and encrypts the data collected from the private cloud before it's sent over the ExpressRoute or VPN network to the Aria Operations running on-premises.
 
 > [!TIP]
-> Refer to the [VMware documentation](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.vapp.doc/GUID-7FFC61A0-7562-465C-A0DC-46D092533984.html) for step-by-step guide for installing vRealize Operations Manager.
+> Refer to the [VMware documentation](https://docs.vmware.com/en/VMware-Aria-Operations/8.14/Getting-Started-Operations/GUID-69F7FAD8-3152-4376-9171-2208D6C9FA3A.html) for step-by-step guide for installing Aria Operations.
 
-## vRealize Operations Cloud managing Azure VMware Solution deployment
-VMware vRealize Operations Cloud supports the Azure VMware Solution, including the vCenter Server, vSAN and NSX-T Data Center adapters.
+## Aria Operations Cloud managing Azure VMware Solution deployment
+VMware Aria Operations Cloud supports the Azure VMware Solution, including the vCenter Server, vSAN and NSX adapters.
 
 > [!IMPORTANT]
-> Refer to the [VMware documentation](https://docs.vmware.com/en/vRealize-Operations/Cloud/com.vmware.vcom.config.doc/GUID-6CDFEDDC-A72C-4AB4-B8E8-84542CC6CE27.html) for step-by-step guide for connecting vRealize Operations Cloud to Azure VMware Solution.
+> Refer to the [VMware documentation](https://docs.vmware.com/en/VMware-Aria-Operations/index.html) for the step-by-step guide for connecting Aria Operations Cloud to Azure VMware Solution.
 
 ## Known limitations
 
-- The **[email protected]** user in Azure VMware Solution has [limited privileges](concepts-identity.md).  Virtual machines (VMs) on Azure VMware Solution doesn't support in-guest memory collection using VMware tools.  Active and consumed memory utilization continues to work in this case.
+- The **[email protected]** user in Azure VMware Solution has [limited privileges](concepts-identity.md). Virtual machines (VMs) on Azure VMware Solution doesn't support in-guest memory collection using VMware tools. Active and consumed memory utilization continues to work in this case.
 - Workload optimization for host-based business intent doesn't work because Azure VMware Solutions manage cluster configurations, including DRS settings.
-- Workload optimization for the cross-cluster placement within the SDDC using the cluster-based business intent is fully supported with vRealize Operations Manager 8.0  and onwards. However, workload optimization isn't aware of resource pools and places the VMs at the cluster level. A user can manually correct it in the Azure VMware Solution vCenter Server interface.
-- You can't sign in to vRealize Operations Manager using your Azure VMware Solution vCenter Server credentials.
-- Azure VMware Solution doesn't support the vRealize Operations Manager plugin.
+- Workload optimization for the cross-cluster placement within the private cloud using the cluster-based business intent is fully supported with Aria Operations. However, workload optimization isn't aware of resource pools and places the VMs at the cluster level. A user can manually correct it in the Azure VMware Solution vCenter Server interface.
+- You can't sign into Aria Operations using your Azure VMware Solution vCenter Server credentials.
+- Azure VMware Solution doesn't support the Aria Operations plugin.
 
-When you connect the Azure VMware Solution vCenter Server to vRealize Operations Manager using a vCenter Server Cloud Account, you see a warning:
+When you connect the Azure VMware Solution vCenter Server to Aria Operations using a vCenter Server CloudAdmin Account, you see a warning:
 
 :::image type="content" source="./media/vrealize-operations-manager/warning-adapter-instance-creation-succeeded.png" alt-text="Screenshot shows a Warning message that states the adapter instance was created successfully.":::
 
 The warning occurs because the **[email protected]** user in Azure VMware Solution doesn't have sufficient privileges to do all vCenter Server actions required for registration. However, the privileges are sufficient for the adapter instance to do data collection, as seen in the following example:
 
 :::image type="content" source="./media/vrealize-operations-manager/adapter-instance-to-perform-data-collection.png" alt-text="Screenshot shows the adapter instance to collect data.":::
 
-For more information, see [Privileges Required for Configuring a vCenter Server Adapter Instance](https://docs.vmware.com/en/vRealize-Operations-Manager/8.1/com.vmware.vcom.core.doc/GUID-3BFFC92A-9902-4CF2-945E-EA453733B426.html).
+For more information, see [Privileges Required for Configuring a vCenter Server Adapter Instance](https://docs.vmware.com/en/VMware-Aria-Operations/8.16/Configuring-Operations/GUID-3BFFC92A-9902-4CF2-945E-EA453733B426.html).
 
 > [!NOTE]
-> VMware vRealize Automation(vRA) integration with the NSX-T Data Center component of the Azure VMware Solution requires the “auditor” role to be added to the user with the NSX-T Manager cloudadmin role.
+> VMware Aria Operations integration with the NSX Manager component of the Azure VMware Solution requires the “auditor” role to be added to the user with the NSX Manager cloudadmin role.
 
 <!-- LINKS - external -->
 

articles/azure-vmware/media/vrealize-operations-manager/vrealize-operations-deployment-option-1.png

@@ -5,7 +5,7 @@ author: AbdullahBell
 ms.author: abell
 ms.service: ddos-protection
 ms.topic: quickstart
-ms.date: 06/22/2023
+ms.date: 03/01/2024
 ms.custom: template-quickstart
 ---