Merge pull request #256261 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

.openpublishing.redirection.json

@@ -24513,7 +24513,17 @@
         },
         {
             "source_path_from_root": "/articles/operator-nexus/template-virtualized-network-function-deployment.md",
-            "redirect_url": "/azure/operator-nexus/quickstarts-tenant-workload-deployment",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/quickstarts-tenant-workload-deployment.md",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/quickstarts-tenant-workload-deployment-ps.md",
+            "redirect_url": "/azure/operator-nexus/quickstarts-virtual-machine-deployment-ps",
             "redirect_document_id": false
         },
         {

articles/batch/managed-identity-pools.md

@@ -10,7 +10,7 @@ ms.custom: devx-track-linux
 
 [Managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md) eliminate
 complicated identity and credential management by providing an identity for the Azure resource in Microsoft Entra ID
-(Microsoft Entra ID). This identity is used to obtain Microsoft Entra tokens to authenticate with target
+(Azure AD ID). This identity is used to obtain Microsoft Entra tokens to authenticate with target
 resources in Azure.
 
 This topic explains how to enable user-assigned managed identities on Batch pools and how to use managed identities within the nodes.

articles/chaos-studio/chaos-studio-limitations.md

@@ -29,6 +29,7 @@ During the public preview of Azure Chaos Studio, there are a few limitations and
 - **Supported browsers** The Chaos Studio portal experience has only been tested on the following browsers:
     * **Windows:** Microsoft Edge, Google Chrome, and Firefox
     * **MacOS:** Safari, Google Chrome, and Firefox
+-- **Terraform** At present Chaos Studio does not support terraform.
 
 ## Known issues
 When you pick target resources for an agent-based fault in the experiment designer, it's possible to select virtual machines or virtual machine scale sets with an operating system not supported by the fault selected.

articles/data-factory/continuous-integration-delivery.md

@@ -7,7 +7,7 @@ author: nabhishek
 ms.author: abnarain
 ms.reviewer: jburchel
 ms.topic: conceptual
-ms.date: 03/16/2023
+ms.date: 10/26/2023
 ms.custom:
 ---
 
@@ -67,7 +67,7 @@ If you're using Git integration with your data factory and have a CI/CD pipeline
     >[!WARNING]
     >If you do not use latest versions of PowerShell and Data Factory module, you may run into deserialization errors while running the commands. 
 
--   **Integration runtimes and sharing**. Integration runtimes don't change often and are similar across all stages in your CI/CD. So Data Factory expects you to have the same name and type of integration runtime across all stages of CI/CD. If you want to share integration runtimes across all stages, consider using a ternary factory just to contain the shared integration runtimes. You can use this shared factory in all of your environments as a linked integration runtime type.
+-   **Integration runtimes and sharing**. Integration runtimes don't change often and are similar across all stages in your CI/CD. So Data Factory expects you to have the same name, type and sub-type of integration runtime across all stages of CI/CD. If you want to share integration runtimes across all stages, consider using a ternary factory just to contain the shared integration runtimes. You can use this shared factory in all of your environments as a linked integration runtime type.
 
     >[!Note]
     >The integration runtime sharing is only available for self-hosted integration runtimes. Azure-SSIS integration runtimes don't support sharing.

articles/dedicated-hsm/tutorial-deploy-hsm-cli.md

@@ -129,13 +129,13 @@ After you configure your network, use these Azure CLI commands to provision your
 There are some other commands that might be useful. Use the [az dedicated-hsm update](/cli/azure/dedicated-hsm#az-dedicated-hsm-update) command to update an HSM:
 
 ```azurecli
-az dedicated-hsm update --resource-group myRG –name hsm1
+az dedicated-hsm update --resource-group myRG –-name hsm1
 ```
 
 To delete an HSM, use the [az dedicated-hsm delete](/cli/azure/dedicated-hsm#az-dedicated-hsm-delete) command:
 
 ```azurecli
-az dedicated-hsm delete --resource-group myRG –name hsm1
+az dedicated-hsm delete --resource-group myRG –-name hsm1
 ```
 
 ## Verifying the Deployment
@@ -256,4 +256,4 @@ A design with two HSMs in a primary region addressing availability at the rack l
 * [Physical Security](physical-security.md)
 * [Networking](networking.md)
 * [Supportability](supportability.md)
-* [Monitoring](monitoring.md)
+* [Monitoring](monitoring.md)

articles/defender-for-cloud/faq-defender-for-servers.yml

@@ -167,16 +167,7 @@ sections:
           - On Windows Server 2012 R2 with Defender for Endpoint unified solution integration enabled, Defender for Servers deploys [Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows) in *active mode*.
           - On newer Windows Server operating systems, Microsoft Defender Antivirus is part of the operating system and will be enabled in *active mode*.
           - On Linux, Defender for Servers deploy Defender for Endpoint including the anti-malware component, and set the component in *passive mode*.
-                    
-      - question: |
-          If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Microsoft Defender for Servers?
-        answer: |
-          If you already have a license for **Microsoft Defender for Endpoint for Servers**, you won't pay for that part of your [Microsoft Defender for Servers Plan 2](plan-defender-for-servers-select-plan.md#plan-features) license. Learn more about [the Microsoft 365 license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
-
-          To request your discount, [contact Defender for Cloud's support team](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint for servers licenses applied for machines in the given workspace.
-
-          The discount is effective starting from the approval date, and won't take place retroactively.
-          
+                      
       - question: |
           How do I switch from a third-party EDR tool?
         answer: |

articles/defender-for-cloud/upcoming-changes.md

@@ -2,15 +2,15 @@
 title: Important upcoming changes
 description: Upcoming changes to Microsoft Defender for Cloud that you might need to be aware of and for which you might need to plan 
 ms.topic: overview
-ms.date: 10/09/2023
+ms.date: 10/26/2023
 ---
 
 # Important upcoming changes to Microsoft Defender for Cloud
 
 > [!IMPORTANT]
 > The information on this page relates to pre-release products or features, which might be substantially modified before they are commercially released, if ever. Microsoft makes no commitments or warranties, express or implied, with respect to the information provided here.
 
-<!-- Please don't adjust this next line without getting approval from the Defender for Cloud documentation team. It is necessary for proper RSS functionality. --> 
+<!-- Please don't adjust this next line without getting approval from the Defender for Cloud documentation team. It is necessary for proper RSS functionality. -->
 
 On this page, you can learn about changes that are planned for Defender for Cloud. It describes planned modifications to the product that might affect things like your secure score or workflows.
 
@@ -25,6 +25,7 @@ If you're looking for the latest release notes, you can find them in the [What's
 
 | Planned change | Announcement date | Estimated date for change |
 |--|--|--|
+| [Changes to how Microsoft Defender for Cloud's costs are presented in Microsoft Cost Management](#changes-to-how-microsoft-defender-for-clouds-costs-are-presented-in-microsoft-cost-management) | October 25, 2023 | November 2023 |
 | [Four alerts are set to be deprecated](#four-alerts-are-set-to-be-deprecated) | October 23, 2023 | November 23, 2023 |
 | [Replacing the "Key Vaults should have purge protection enabled" recommendation with combined recommendation "Key Vaults should have deletion protection enabled"](#replacing-the-key-vaults-should-have-purge-protection-enabled-recommendation-with-combined-recommendation-key-vaults-should-have-deletion-protection-enabled) |  | June 2023|
 | [Preview alerts for DNS servers to be deprecated](#preview-alerts-for-dns-servers-to-be-deprecated) |  | August 2023 |
@@ -35,6 +36,18 @@ If you're looking for the latest release notes, you can find them in the [What's
 | [Deprecating two security incidents](#deprecating-two-security-incidents) |  | November 2023 |
 | [Defender for Cloud plan and strategy for the Log Analytics agent deprecation](#defender-for-cloud-plan-and-strategy-for-the-log-analytics-agent-deprecation) |  | August 2024 |
 
+## Changes to how Microsoft Defender for Cloud's costs are presented in Microsoft Cost Management
+
+**Annoucement date: October 26, 2023**
+
+**Estimated date for change: November 2023**
+
+In November there will be a change as to how Microsoft Defender for Cloud's costs are presented in Cost Management and in Subscriptions invoices.
+
+Costs will be presented for each protected resource instead of as an aggregation of all resources on the subscription.
+
+If a resource has a tag applied, which are often used by organizations to perform financial chargeback processes, it will be added to the appropriate billing lines.
+
 ## Four alerts are set to be deprecated
 
 **Announcement date: October 23, 2023**

articles/hdinsight-aks/TOC.yml

@@ -267,6 +267,8 @@ items:
     href: https://azure.microsoft.com/pricing/calculator/
   - name: Support options
     href: ./hdinsight-aks-support-help.md
+  - name: Trademarks
+    href: ./trademarks.md
   - name: Troubleshoot
     items:
     - name: Cluster creation errors

articles/hdinsight-aks/overview.md

@@ -11,7 +11,8 @@ ms.date: 08/29/2023
 
 [!INCLUDE [feature-in-preview](includes/feature-in-preview.md)]
 
-HDInsight on AKS is a modern, reliable, secure, and fully managed Platform as a Service (PaaS) that runs on Azure Kubernetes Service (AKS). HDInsight on AKS allows you to deploy popular Open-Source Analytics workloads like Apache Spark, Apache Flink, and Trino without the overhead of managing and monitoring containers.
+HDInsight on AKS is a modern, reliable, secure, and fully managed Platform as a Service (PaaS) that runs on Azure Kubernetes Service (AKS). HDInsight on AKS allows you to deploy popular Open-Source Analytics workloads like Apache Spark™, Apache Flink®️, and Trino without the overhead of managing and monitoring containers.
+
 You can build end-to-end, petabyte-scale Big Data applications spanning streaming through Apache Flink, data engineering and machine learning using Apache Spark, and Trino's powerful query engine.
 
 All these capabilities combined with HDInsight on AKS’s strong developer focus enables enterprises and digital natives with deep technical expertise to build and operate applications that are right fit for their needs. HDInsight on AKS allows developers to access all the rich configurations provided by open-source software and the extensibility to seamlessly include other ecosystem offerings. This offering empowers developers to test and tune their applications to extract the best performance at optimal cost.
@@ -24,9 +25,8 @@ HDInsight on AKS integrates with the entire Azure ecosystem, shortening implemen
 
  HDInsight on AKS introduces the concept of cluster pools and clusters, which allow you to realize the complete value of data lakehouse. Cluster pools allow you to use multiple compute workloads on a single data lake, thereby removing the overhead of network management and resource planning. 
 
-* **Cluster pools** are a logical grouping of clusters that help build robust interoperability across multiple cluster types and allow enterprises to have the clusters in the same virtual network. Cluster pools provide rapid and cost-effective access to all the cluster types created on-demand and at scale. 
-<br>One cluster pool corresponds to one cluster in AKS infrastructure. 
-* **Clusters** are individual compute workloads, such as Apache Spark, Apache Flink, and Trino, that can be created rapidly in few minutes with preset configurations.
+* **Cluster pools** are a logical grouping of clusters that help build robust interoperability across multiple cluster types and allow enterprises to have the clusters in the same virtual network. Cluster pools provide rapid and cost-effective access to all the cluster types created on-demand and at scale. One cluster pool corresponds to one cluster in AKS infrastructure. 
+* **Clusters** are individual compute workloads, such as Apache Spark, Apache Flink, and Trino that can be created rapidly in few minutes with preset configurations.
 
 You can create the pool with a single cluster or a combination of cluster types, which are based on the need and can custom configure the following options:
 
@@ -56,14 +56,16 @@ The latest version of HDInsight is orchestrated using AKS, which enables the pla
 
 HDInsight on AKS can connect seamlessly with HDInsight. You can reap the benefits of using needed cluster types in a hybrid model. Interoperate with cluster types of HDInsight using the same storage and metastore across both the offerings. 
 
+[HDInsight](/azure/hdinsight/) offers Apache Kafka®, Apache HBase® and other analytics workloads in Platform as a Service (PaaS) formfactor.
+
 :::image type="content" source="./media/overview/connectivity-diagram.png" alt-text="Diagram showing connectivity concepts.":::
 
 **The following scenarios are supported:**
 
-* [Flink connecting to HBase](./flink/use-flink-to-sink-kafka-message-into-hbase.md)
-* [Flink connecting to Kafka](./flink/join-stream-kafka-table-filesystem.md)
-* Spark connecting to HBase
-* Spark connecting to Kafka
+* [Apache Flink connecting to Apache HBase](./flink/use-flink-to-sink-kafka-message-into-hbase.md)
+* [Apache Flink connecting to Apache Kafka](./flink/join-stream-kafka-table-filesystem.md)
+* Apache Spark connecting to Apache HBase
+* Apache Spark connecting to Apache Kafka
 
 ## Security architecture
 
@@ -82,3 +84,13 @@ For more information, see [HDInsight on AKS security](./concept-security.md).
 * West US 2
 * West US 3
 * East US
+
+> [!Note]
+> - The Trino brand and trademarks are owned and managed by the [Trino Software Foundation](https://trino.io/foundation.html). No endorsement by The Trino Software Foundation is implied by the use of these marks.
+> - Apache Spark, Spark and the Spark logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+> - Apache, Apache Kafka, Kafka and the Kafka logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+> - Apache, Apache Flink, Flink and the Flink logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+> - Apache HBase, HBase and the HBase logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+> - Apache®, Apache Spark™, Apache HBase®, Apache Kafka®, and Apache Flink® are either registered trademarks or trademarks of the [Apache Software Foundation](https://www.apache.org/) in the United States and/or other countries. No endorsement by The Apache Software Foundation is implied by the use of these marks.
+
+

articles/hdinsight-aks/trademarks.md

@@ -0,0 +1,18 @@
+---
+title: Trademarks
+description: The Trademark and Brand Guidelines detail how you can help us protect Microsoft’s brand assets.
+ms.service: hdinsight-aks
+ms.topic: legal
+ms.date: 10/26/2023
+---
+
+# Trademarks
+
+Product names, logos and other material used on this Azure HDInsight on AKS learn pages are registered trademarks of various entities including, but not limited to, the following trademark owners and names:
+
+- The [Trino Software Foundation](https://trino.io/foundation.html) owns and manages the Trino brand and trademarks. The use of these marks does not imply endorsement by The Trino Software Foundation.
+- Apache Spark, Spark and the Spark logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+- Apache, Apache Kafka, Kafka and the Kafka logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+- Apache, Apache Flink, Flink and the Flink logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+- Apache HBase, HBase and the HBase logo are trademarks of the [Apache Software Foundation](https://www.apache.org/) (ASF).
+- Apache®, Apache Spark™, Apache HBase®, Apache Kafka®, and Apache Flink® are either registered trademarks or trademarks of the Apache Software Foundation in the United States and/or other countries. The use of these marks does not imply endorsement by The Apache Software Foundation.