Merge pull request #284920 from MicrosoftDocs/main

Publish to live, Sunday 4 AM PST, 8/18

Author: ttorble

.openpublishing.redirection.json

@@ -4554,6 +4554,21 @@
       "source_path_from_root": "/articles/virtual-network/tutorial-restrict-network-access-to-resources-powershell.md",
       "redirect_url": "/azure/virtual-network/tutorial-restrict-network-access-to-resources",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/how-to-create-encryption-portal.md",
+      "redirect_url": "/azure/virtual-network/how-to-create-encryption",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/how-to-create-encryption-powershell.md",
+      "redirect_url": "/azure/virtual-network/how-to-create-encryption",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
+      "redirect_url": "/azure/virtual-network/how-to-create-encryption",
+      "redirect_document_id": false
     }
   ]
 }

articles/azure-functions/functions-create-first-quarkus.md

@@ -305,7 +305,7 @@ Now that you've opened your Azure function in the portal, here are more features
 
 ## Clean up resources
 
-If you don't need these resources, you can delete them by running the following command in Azure Cloud Shell or on your local terminal:
+If you don't need these resources, you can delete them by running the following command:
 
 ```azurecli
 az group delete --name <yourResourceGroupName> --yes

articles/azure-monitor/agents/data-collection-log-json.md

@@ -105,6 +105,10 @@ Invoke-AzRestMethod -Path "/subscriptions/{subscription}/resourcegroups/{resourc
 > The agent based JSON custom file ingestion is currently in preview and does not have a complete UI experience in the portal yet. While you can create the DCR using the portal, you must modify it to define the columns in the incoming stream. This section includes details on creating the DCR using an ARM template.
 
 ### Incoming stream schema
+
+> [!NOTE]
+> Multiline support that uses an [ISO 8601](https://wikipedia.org/wiki/ISO_8601) time stamp to delimited events is expected mid-October 2024
+
 JSON files include a property name with each value, and the incoming stream in the DCR needs to include a column matching the name of each property. You need to modify the `columns` section of the ARM template with the columns from your log.
 
  The following table describes optional columns that you can include in addition to the columns defining the data in your log file. 

articles/azure-monitor/agents/data-collection-log-text.md

@@ -49,6 +49,10 @@ Adhere to the following recommendations to ensure that you don't experience data
 
 
 ## Incoming stream
+
+> [!NOTE]
+> Multiline support that uses an [ISO 8601](https://wikipedia.org/wiki/ISO_8601) time stamp to delimited events is expected mid-October 2024
+
 The incoming stream of data includes the columns in the following table. 
 
 | Column | Type | Description |

articles/azure-monitor/autoscale/autoscale-custom-metric.md

@@ -27,7 +27,7 @@ Azure Monitor autoscale applies to:
 + [Azure Cloud Services](https://azure.microsoft.com/services/cloud-services/)
 + [Azure App Service - Web Apps](https://azure.microsoft.com/services/app-service/web/)
 + [Azure Data Explorer cluster](https://azure.microsoft.com/services/data-explorer/) 
-+ Integration service environment and [Azure API Management](../../api-management/api-management-key-concepts.md)
++ [Azure API Management](../../api-management/api-management-key-concepts.md)
 
 ## Prerequisite
 

articles/connectors/built-in.md

@@ -17,7 +17,7 @@ For a smaller number of services, systems, and protocols, Azure Logic Apps provi
 
 For example, a Standard workflow can use both managed connectors and built-in connectors for Azure Blob Storage, Azure Cosmos DB, Azure Event Hubs, Azure Service Bus, FTP, IBM DB2, IBM MQ, SFTP, and SQL Server. A Consumption workflow doesn't have the built-in versions. A Consumption workflow can use built-in connectors for Azure API Management, and Azure App Service, while a Standard workflow doesn't have these built-in connectors.
 
-Also, in Standard workflows, some [built-in connectors with specific attributes are informally known as *service providers*](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation). Some built-in connectors support only a single way to authenticate a connection to the underlying service. Other built-in connectors can offer a choice, such as using a connection string, Microsoft Entra ID, or a managed identity. All built-in connectors run in the same process as the Azure Logic Apps runtime. For more information, review [Single-tenant versus multitenant and integration service environment (ISE)](../logic-apps/single-tenant-overview-compare.md).
+Also, in Standard workflows, some [built-in connectors with specific attributes are informally known as *service providers*](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation). Some built-in connectors support only a single way to authenticate a connection to the underlying service. Other built-in connectors can offer a choice, such as using a connection string, Microsoft Entra ID, or a managed identity. All built-in connectors run in the same process as the Azure Logic Apps runtime. For more information, review [Single-tenant versus multitenant in Azure Logic Apps](../logic-apps/single-tenant-overview-compare.md).
 
 This article provides a general overview about built-in connectors in Consumption workflows versus Standard workflows.
 

articles/connectors/introduction.md

@@ -29,7 +29,7 @@ This overview provides a high-level introduction to connectors and how they gene
 
 ## Built-in connectors versus managed connectors
 
-In Azure Logic Apps, connectors are either *built in* or *managed*. Some connectors have both versions. The available versions depend on whether you create a *Consumption* logic app workflow that runs in multi-tenant Azure Logic Apps or a *Standard* logic app workflow that runs in single-tenant Azure Logic Apps. For more information about logic app resource types, see [Resource types and host environment differences](../logic-apps/logic-apps-overview.md#resource-environment-differences).
+In Azure Logic Apps, connectors are either *built in* or *managed*. Some connectors have both versions. The available versions depend on whether you create a *Consumption* logic app workflow that runs in multitenant Azure Logic Apps or a *Standard* logic app workflow that runs in single-tenant Azure Logic Apps. For more information about logic app resource types, see [Resource types and host environment differences](../logic-apps/logic-apps-overview.md#resource-environment-differences).
 
 * [Built-in connectors](built-in.md) are designed to run directly and natively inside Azure Logic Apps.
 
@@ -120,7 +120,7 @@ If your workflows also use managed connectors, such as the Office 365 Outlook co
 
 ## Custom connectors and APIs
 
-In Consumption workflows for multi-tenant Azure Logic Apps, you can call Swagger-based or SOAP-based APIs that aren't available as out-of-the-box connectors. You can also run custom code by creating custom API Apps. For more information, see the following documentation:
+In Consumption workflows for multitenant Azure Logic Apps, you can call Swagger-based or SOAP-based APIs that aren't available as out-of-the-box connectors. You can also run custom code by creating custom API Apps. For more information, see the following documentation:
 
 * [Swagger-based or SOAP-based custom connectors for Consumption workflows](../logic-apps/custom-connector-overview.md#custom-connector-consumption)
 
@@ -138,7 +138,17 @@ In Standard workflows for single-tenant Azure Logic Apps, you can create nativel
 
 ## ISE and connectors
 
-For workflows that need direct access to resources in an Azure virtual network, you can use a dedicated [integration service environment (ISE)](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md) where you can build, deploy, and run your workflows on dedicated resources.
+> [!IMPORTANT]
+>
+> On August 31, 2024, the ISE resource retires, due to its dependency on Azure Cloud Services (classic), 
+> which retires at the same time. Before the retirement date, export any logic apps from your ISE to Standard 
+> logic apps to avoid service disruption. Standard logic app workflows run in single-tenant Azure Logic Apps 
+> and provide the same capabilities plus more. For example, Standard workflows support using private endpoints 
+> for inbound traffic so that your workflows can communicate privately and securely with virtual networks. 
+> Standard workflows also support virtual network integration for outbound traffic. For more information, 
+> review [Secure traffic between virtual networks and single-tenant Azure Logic Apps using private endpoints](/azure/logic-apps/secure-single-tenant-workflow-virtual-network-private-endpoint).
+
+If you use a dedicated [integration service environment (ISE)](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md) where workflows can directly access to resources in an Azure virtual network, you can build, deploy, and run your workflows on dedicated resources.
 
 Custom connectors created within an ISE don't work with the on-premises data gateway. However, these connectors can directly access on-premises data sources that are connected to an Azure virtual network hosting the ISE. So, logic app workflows in an ISE most likely don't need the data gateway when communicating with those resources. If you have custom connectors that you created outside an ISE that require the on-premises data gateway, workflows in an ISE can use those connectors.
 
@@ -147,36 +157,20 @@ In the workflow designer, when you browse the built-in connectors or managed con
 :::row:::
     :::column:::
         ![Example CORE connector](./media/apis-list/example-core-connector.png)
-        \
-        \
-        **CORE**
-        \
-        \
-        Built-in connectors with this label run in the same ISE as your workflows.
+        <br><br>**CORE**
+        <br><br>Built-in connectors with this label run in the same ISE as your workflows.
     :::column-end:::
     :::column:::
         ![Example ISE connector](./media/apis-list/example-ise-connector.png)
-        \
-        \
-        **ISE**
-        \
-        \
-        Managed connectors with this label run in the same ISE as your workflows.
-        \
-        \
-        If you have an on-premises system that's connected to an Azure virtual network, an ISE lets your workflows directly access that system without using the [on-premises data gateway](../logic-apps/logic-apps-gateway-connection.md). Instead, you can either use that system's **ISE** connector if available, an HTTP action, or a [custom connector](#custom-connectors-and-apis).
-        \
-        \
-        For on-premises systems that don't have **ISE** connectors, use the on-premises data gateway. To find available ISE connectors, review [ISE connectors](#ise-and-connectors).
+        <br><br>**ISE**
+        <br><br>Managed connectors with this label run in the same ISE as your workflows.
+        <br><br>If you have an on-premises system that's connected to an Azure virtual network, an ISE lets your workflows directly access that system without using the [on-premises data gateway](../logic-apps/logic-apps-gateway-connection.md). Instead, you can either use that system's **ISE** connector if available, an HTTP action, or a [custom connector](#custom-connectors-and-apis).
+        <br><br>For on-premises systems that don't have **ISE** connectors, use the on-premises data gateway. To find available ISE connectors, review [ISE connectors](#ise-and-connectors).
     :::column-end:::
     :::column:::
-        ![Example non-ISE connector](./media/apis-list/example-multi-tenant-connector.png)
-        \
-        \
-        No label
-        \
-        \
-        All other connectors without a label, which you can continue to use, run in the global, multi-tenant Logic Apps service.
+        ![Example non-ISE connector](./media/apis-list/example-multitenant-connector.png)
+        <br><br>No label
+        <br><br>All other connectors without a label, which you can continue to use, run in the global, multitenant Logic Apps service.
     :::column-end:::
     :::column:::
     :::column-end:::

articles/connectors/managed.md

@@ -15,7 +15,7 @@ Managed connectors provide ways for you to access other services and systems whe
 
 For a smaller number of services, systems and protocols, Azure Logic Apps provides a built-in version alongside the managed version. The number and range of built-in connectors vary based on whether you create a Consumption logic app workflow that runs in multitenant Azure Logic Apps or a Standard logic app workflow that runs in single-tenant Azure Logic Apps. In most cases, the built-in version provides better performance, capabilities, pricing, and so on. In a few cases, some built-in connectors are available only in one logic app workflow type, and not the other.
 
-For example, a Standard workflow can use both managed connectors and built-in connectors for Azure Blob, Azure Cosmos DB, Azure Event Hubs, Azure Service Bus, DB2, FTP, MQ, SFTP, and SQL Server, while a Consumption workflow doesn't have the built-in versions. A Consumption workflow can use built-in connectors for Azure API Management, Azure App Services, and Batch, while a Standard workflow doesn't have these built-in connectors. For more information, review [Built-in connectors in Azure Logic Apps](built-in.md) and [Single-tenant versus multitenant and integration service environment (ISE)](../logic-apps/single-tenant-overview-compare.md).
+For example, a Standard workflow can use both managed connectors and built-in connectors for Azure Blob, Azure Cosmos DB, Azure Event Hubs, Azure Service Bus, DB2, FTP, MQ, SFTP, and SQL Server, while a Consumption workflow doesn't have the built-in versions. A Consumption workflow can use built-in connectors for Azure API Management, Azure App Services, and Batch, while a Standard workflow doesn't have these built-in connectors. For more information, review [Built-in connectors in Azure Logic Apps](built-in.md) and [Single-tenant versus multitenant in Azure Logic Apps](../logic-apps/single-tenant-overview-compare.md).
 
 This article provides a general overview about managed connectors and the way they're organized in the Consumption workflow designer versus the Standard workflow designer with examples. For technical reference information about each managed connector in Azure Logic Apps, review [Connectors reference for Azure Logic Apps](/connectors/connector-reference/connector-reference-logicapps-connectors).
 
@@ -37,8 +37,6 @@ Some managed connectors also fall into the following informal groups:
 
 * [Integration account connectors](#integration-account-connectors) help you transform and validate XML, encode and decode flat files, and process business-to-business (B2B) messages using AS2, EDIFACT, and X12 protocols.
 
-* [Integration service environment connectors](#ise-connectors) and are designed to run specifically in an ISE and provide benefits over their non-ISE versions.
-
 <a name="standard-connectors"></a>
 
 ## Standard connectors

articles/connectors/media/apis-list/example-multi-tenant-connector.png renamed to articles/connectors/media/apis-list/example-multitenant-connector.png

@@ -325,8 +325,6 @@
           href: user-defined-routes.md
         - name: Securing a custom VNET with an NSG
           href: firewall-integration.md
-    - name: Network proxying
-      href: network-proxy.md
     - name: Use a custom VNET
       href: vnet-custom.md
 - name: Languages and runtimes
@@ -335,6 +333,7 @@
       items:
       - name: Overview
         href: dotnet-overview.md
+        displayName: .NET overview
       - name: Deploy a .NET Aspire app
         href: /dotnet/aspire/deployment/azure/aca-deployment
       - name: Deploy and scale an ASP.NET Core app