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

Author: HeidiSteen

articles/aks/network-observability-overview.md

@@ -54,8 +54,6 @@ When the Network Observability add-on is enabled, it allows for the collection a
 
 * Pod level metrics aren't supported.
 
-* The deployment of the Network Observability add-on on Mariner 1.0 is currently unsupported.
-
 ## Scale
 
 Certain scale limitations apply when you use Azure managed Prometheus and Grafana. For more information, see [Scrape Prometheus metrics at scale in Azure Monitor](/azure/azure-monitor/essentials/prometheus-metrics-scrape-scale)
@@ -68,3 +66,4 @@ Certain scale limitations apply when you use Azure managed Prometheus and Grafan
 
 - To create an AKS cluster with Network Observability and BYO Prometheus and Grafana, see [Setup Network Observability for Azure Kubernetes Service (AKS) BYO Prometheus and Grafana](network-observability-byo-cli.md).
 
+

articles/azure-cache-for-redis/cache-tutorial-functions-getting-started.md

@@ -58,20 +58,14 @@ The new project is created:
 
 <!-- ![Image](Media/VSCodeWorkspace.png) -->
 
-### Install necessary NuGet packages
+### Install the necessary NuGet package
 
-You need to install two NuGet packages:
+You'll need to install `Microsoft.Azure.WebJobs.Extensions.Redis`, the NuGet package for the Redis extension that allows Redis keyspace notifications to be used as triggers in Azure Functions.
 
-1. [StackExchange.Redis](https://www.nuget.org/packages/StackExchange.Redis/), which is the primary .NET client for Redis.
-
-1. `Microsoft.Azure.WebJobs.Extensions.Redis`, which is the extension that allows Redis keyspace notifications to be used as triggers in Azure Functions.
-
-Install these packages by going to the **Terminal** tab in VS Code and entering the following commands:
+Install this package by going to the **Terminal** tab in VS Code and entering the following command:
 
 ```terminal
-dotnet add package StackExchange.Redis
-dotnet add package Microsoft.Azure.WebJobs.Extensions.Redis
-dotnet restore
+dotnet add package Microsoft.Azure.WebJobs.Extensions.Redis --prerelease
 ```
 
 ### Configure cache
@@ -92,82 +86,58 @@ Go back to VS Code, add a file to the project called `RedisFunctions.cs` Copy an
 
 ```csharp
 using Microsoft.Extensions.Logging;
-using System.Text.Json;
+using StackExchange.Redis;
 
 namespace Microsoft.Azure.WebJobs.Extensions.Redis.Samples
 {
     public static class RedisSamples
     {
-        public const string localhostSetting = "redisLocalhost";
+        public const string connectionString = "redisConnectionString";
 
         [FunctionName(nameof(PubSubTrigger))]
         public static void PubSubTrigger(
-            [RedisPubSubTrigger(localhostSetting, "pubsubTest")] RedisMessageModel model,
-            ILogger logger)
-        {
-            logger.LogInformation(JsonSerializer.Serialize(model));
-        }
-
-        [FunctionName(nameof(PubSubTriggerResolvedChannel))]
-        public static void PubSubTriggerResolvedChannel(
-            [RedisPubSubTrigger(localhostSetting, "%pubsubChannel%")] RedisMessageModel model,
+            [RedisPubSubTrigger(connectionString, "pubsubTest")] string message,
             ILogger logger)
         {
-            logger.LogInformation(JsonSerializer.Serialize(model));
+            logger.LogInformation(message);
         }
 
         [FunctionName(nameof(KeyspaceTrigger))]
         public static void KeyspaceTrigger(
-            [RedisPubSubTrigger(localhostSetting, "__keyspace@0__:keyspaceTest")] RedisMessageModel model,
+            [RedisPubSubTrigger(connectionString, "__keyspace@0__:keyspaceTest")] string message,
             ILogger logger)
         {
-            logger.LogInformation(JsonSerializer.Serialize(model));
+            logger.LogInformation(message);
         }
 
         [FunctionName(nameof(KeyeventTrigger))]
         public static void KeyeventTrigger(
-            [RedisPubSubTrigger(localhostSetting, "__keyevent@0__:del")] RedisMessageModel model,
-            ILogger logger)
-        {
-            logger.LogInformation(JsonSerializer.Serialize(model));
-        }
-
-        [FunctionName(nameof(ListsTrigger))]
-        public static void ListsTrigger(
-            [RedisListTrigger(localhostSetting, "listTest")] RedisMessageModel model,
-            ILogger logger)
-        {
-            logger.LogInformation(JsonSerializer.Serialize(model));
-        }
-
-        [FunctionName(nameof(ListsMultipleTrigger))]
-        public static void ListsMultipleTrigger(
-            [RedisListTrigger(localhostSetting, "listTest1 listTest2")] RedisMessageModel model,
+            [RedisPubSubTrigger(connectionString, "__keyevent@0__:del")] string message,
             ILogger logger)
         {
-            logger.LogInformation(JsonSerializer.Serialize(model));
+            logger.LogInformation(message);
         }
 
-        [FunctionName(nameof(StreamsTrigger))]
-        public static void StreamsTrigger(
-            [RedisStreamTrigger(localhostSetting, "streamTest")] RedisMessageModel model,
+        [FunctionName(nameof(ListTrigger))]
+        public static void ListTrigger(
+            [RedisListTrigger(connectionString, "listTest")] string entry,
             ILogger logger)
         {
-            logger.LogInformation(JsonSerializer.Serialize(model));
+            logger.LogInformation(entry);
         }
 
-        [FunctionName(nameof(StreamsMultipleTriggers))]
-        public static void StreamsMultipleTriggers(
-            [RedisStreamTrigger(localhostSetting, "streamTest1 streamTest2")] RedisMessageModel model,
+        [FunctionName(nameof(StreamTrigger))]
+        public static void StreamTrigger(
+            [RedisStreamTrigger(connectionString, "streamTest")] string entry,
             ILogger logger)
         {
-            logger.LogInformation(JsonSerializer.Serialize(model));
+            logger.LogInformation(entry);
         }
     }
 }
 ```
 
-This tutorial shows multiple different triggers:
+This tutorial shows multiple different ways to trigger on Redis activity:
 
 1. _PubSubTrigger_, which is triggered when activity is published to the pub/sub channel named `pubsubTest`
 
@@ -177,13 +147,24 @@ This tutorial shows multiple different triggers:
 
 1. _ListTrigger_, which looks for changes to the list `listTest`
 
-1. _ListMultipleTrigger_, which looks for changes to list `listTest1` and `listTest2`
-
 1. _StreamTrigger_, which looks for changes to the stream `streamTest`
 
-1. _StreamMultipleTrigger_, which looks for changes to streams `streamTest1` and `streamTest2`
+### Connect to your cache
+In order to trigger on Redis activity, you need to pass in the connection string of your cache instance. This information will be stored in the `local.settings.json` file that was automatically created in your folder. Using the [local settings file](../azure-functions/functions-run-local.md#local-settings) is recommended as a security best practice.
 
-To connect to your cache, take the connection string you copied from earlier and paste to replace the value of `localhost` at the top of the file, set to `127.0.0.1:6379` by default.
+To connect to your cache, add a `ConnectionStrings` section in the `local.settings.json` file and add your connection string using the parameter `redisConnectionString`. It should look like this:
+
+```json
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
+  },
+  "ConnectionStrings": {
+    "redisConnectionString": "<your-connection-string>"
+  }
+}
+```
 
 <!-- ![Image](Media/ConnectionString.png) -->
 
@@ -199,12 +180,12 @@ To test the trigger functionality, try creating and deleting the _keyspaceTest_
 
 After it's open, try the following commands:
 
-- SET keyspaceTest 1
-- SET keyspaceTest 2
-- DEL keyspaceTest
-- PUBLISH pubsubTest testMessage
-- LPUSH listTest test
-- XADD streamTest * name Clippy
+- `SET keyspaceTest 1`
+- `SET keyspaceTest 2`
+- `DEL keyspaceTest`
+- `PUBLISH pubsubTest testMessage`
+- `LPUSH listTest test`
+- `XADD streamTest * name Clippy`
 
 <!-- ![Image](Media/Console2.png) -->
 
@@ -241,7 +222,13 @@ Wait a few minutes for the new Function App to be created. It appears in the dro
 
 The app builds and starts deploying. You can track progress in the **Output Window**.
 
-Once deployment is complete, open your Function App in the Azure portal and select **Log Stream** from the Resource menu. Wait for log analytics to connect, and then use the Redis console to activate any of the triggers. You should see the triggers being logged here.
+### Add connection string information
+
+Navigate to your new Function App in the Azure portal and select the **Configuration** blade from the Resource menu. You'll notice that your application settings have automatically been added to the Function App. For security, however, the connection string information in your `local.settings.json` file is not automatically added. Select **New connection string** and enter `redisConnectionString` as the Name, and your connection string as the Value. Set Type to _Custom_, and select **Ok** to close the menu and then **Save** on the Configuration page to confirm. The functions app will restart with the new connection string information. 
+
+### Test your triggers
+
+Once deployment is complete and the connection string information added, open your Function App in the Azure portal and select **Log Stream** from the Resource menu. Wait for log analytics to connect, and then use the Redis console to activate any of the triggers. You should see the triggers being logged here.
 
 <!-- ![Image](Media/LogStream.png) -->
 

articles/azure-resource-manager/bicep/bicep-functions-string.md

@@ -143,7 +143,7 @@ The output from the preceding example with the default values is:
 
 `concat(arg1, arg2, arg3, ...)`
 
-Combines multiple string values and returns the concatenated string, or combines multiple arrays and returns the concatenated array. Instead of using the `concat` function, use string interpolation, except in certain cases involving [multi-line strings](../bicep/data-types.md#multi-line-strings). For more information about combining multiple arrays, see [concat](./bicep-functions-array.md#concat).
+Combines multiple string values and returns the concatenated string, or combines multiple arrays and returns the concatenated array. To improve readability, use [string interpolation](./data-types.md#strings) instead of the `concat()` function. However, in some cases such as string replacement in [multi-line strings](../bicep/data-types.md#multi-line-strings), you may need to fall back on using the `concat()` function or the [`replace()` function](#replace).
 
 Namespace: [sys](bicep-functions.md#namespaces-for-functions).
 
@@ -162,7 +162,7 @@ A string or array of concatenated values.
 
 ### Examples
 
-The following example shows a comparison between using interpolation and using the `concat` function. The two outputs return the same value.
+The following example shows a comparison between using interpolation and using the `concat()` function. The two outputs return the same value.
 
 ```bicep
 param prefix string = 'prefix'
@@ -178,7 +178,7 @@ The outputs from the preceding example with the default value are:
 | concatOutput | String | prefixAnd5yj4yjf5mbg72 |
 | interpolationOutput | String | prefixAnd5yj4yjf5mbg72 |
 
-Interpolation is not currently supported in multi-line strings. The following example shows a comparison between using interpolation and using the `concat` function.
+Interpolation is not currently supported in multi-line strings. The following example shows a comparison between using interpolation and using the `concat()` function.
 
 ```bicep
 var blocked = 'BLOCKED'

articles/azure-resource-manager/templates/template-functions-string.md

@@ -150,7 +150,8 @@ The output from the preceding example with the default values is:
 
 Combines multiple string values and returns the concatenated string, or combines multiple arrays and returns the concatenated array.
 
-In Bicep, use [string interpolation](../bicep/data-types.md#strings) instead of the [`concat`](../bicep/bicep-functions-string.md#concat) function, except in certain cases involving [multi-line strings](../bicep/data-types.md#multi-line-strings).
+In Bicep, use [string interpolation](../bicep/data-types.md#strings) instead of the [`concat()`](../bicep/bicep-functions-string.md#concat) function to improve readability. However, in some cases such as string replacement in [multi-line strings](../bicep/data-types.md#multi-line-strings), you may need to fall back on using the [`concat()`](../bicep/bicep-functions-string.md#concat) function or the [`replace()` function](../bicep/bicep-functions-string.md#replace).
+
 
 ### Parameters
 

articles/event-grid/sdk-overview.md

@@ -2,7 +2,7 @@
 title: Azure Event Grid SDKs
 description: Describes the SDKs for Azure Event Grid. These SDKs provide management, publishing and consumption.
 ms.topic: reference
-ms.date: 05/17/2021
+ms.date: 07/06/2023
 ms.devlang: csharp, golang, java, javascript, python
 ---
 
@@ -12,27 +12,33 @@ Event Grid provides SDKs that enable you to programmatically manage your resourc
 
 ## Management SDKs
 
-The management SDKs enable you to create, update, and delete event grid topics and subscriptions. Currently, the following SDKs are available:
+The management SDKs enable you to create, update, and delete Event Grid topics and subscriptions. Currently, the following SDKs are available:
+
+| SDK | Package | Reference documentation |  Samples | 
+| -------- | ------- | ----------------------- | ---- | 
+| REST API | | [REST reference](/rest/api/eventgrid/controlplane-version2023-06-01-preview/ca-certificates) | |
+| .NET | [Azure.ResourceManager.EventGrid](https://www.nuget.org/packages/Azure.ResourceManager.EventGrid/) | [.NET reference](/dotnet/api/overview/azure/resourcemanager.eventgrid-readme?view=azure-dotnet-preview&preserve-view=true) | [.NET samples](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/eventgrid/Azure.ResourceManager.EventGrid/samples) |
+| Java | [azure-resourcemanager-eventgrid](https://central.sonatype.com/artifact/com.azure.resourcemanager/azure-resourcemanager-eventgrid/) | [Java reference](/java/api/overview/azure/resourcemanager-eventgrid-readme?view=azure-java-preview&preserve-view=true) | [Java samples](https://github.com/azure/azure-sdk-for-java/tree/main/sdk/eventgrid/azure-resourcemanager-eventgrid/src/samples) |
+| JavaScript | [@azure/arm-eventgrid](https://www.npmjs.com/package/@azure/arm-eventgrid) | [JavaScript reference](/javascript/api/overview/azure/arm-eventgrid-readme?view=azure-node-preview&preserve-view=true) | [JavaScript and TypeScript samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/eventgrid/arm-eventgrid) |
+| Python | [azure-mgmt-eventgrid](https://pypi.org/project/azure-mgmt-eventgrid/) | [Python reference](/python/api/azure-mgmt-eventgrid/?view=azure-python-preview&preserve-view=true) | [Python samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-mgmt-eventgrid/generated_samples)
+| Go | [Azure SDK for Go](https://github.com/Azure/azure-sdk-for-go) | | [Go samples](https://github.com/Azure-Samples/azure-sdk-for-go-samples/tree/main/sdk/resourcemanager/eventgrid) |
 
-* [.NET](https://www.nuget.org/packages/Microsoft.Azure.Management.EventGrid)
-* [Go](https://github.com/Azure/azure-sdk-for-go)
-* [Java](https://search.maven.org/#search%7Cga%7C1%7Cazure-resourcemanager-eventgrid)
-* [Node](https://www.npmjs.com/package/@azure/arm-eventgrid)
-* [Python](https://pypi.python.org/pypi/azure-mgmt-eventgrid)
-* [Ruby](https://rubygems.org/gems/azure_mgmt_event_grid)
 
 ## Data plane SDKs
 
+> [!NOTE]
+> For MQTT messaging, you can use your favorite MQTT SDK.  Currently Azure Event Grid doesn't provide data plane SDK for MQTT.
+
 The data plane SDKs enable you to post events to topics by taking care of authenticating, forming the event, and asynchronously posting to the specified endpoint. They also enable you to consume first party events. Currently, the following SDKs are available:
 
-| Programming language | SDK | 
-| -------------------- | ---------- | 
-| .NET | Latest stable SDK: [Azure.Messaging.EventGrid](https://www.nuget.org/packages/Azure.Messaging.EventGrid/)<p>Legacy SDK: [Microsoft.Azure.EventGrid](https://www.nuget.org/packages/Microsoft.Azure.EventGrid) |
-| Java | Latest stable SDK: [azure-messaging-eventgrid](https://search.maven.org/artifact/com.azure/azure-messaging-eventgrid/)<p>Legacy SDK: [azure-eventgrid](https://mvnrepository.com/artifact/com.microsoft.azure/azure-eventgrid)</p> |  
-| Python | [azure-eventgrid](https://pypi.org/project/azure-eventgrid/) |
-| JavaScript | [@azure/eventgrid](https://www.npmjs.com/package/@azure/eventgrid/) | 
-| Go | [Azure SDK for Go](https://github.com/Azure/azure-sdk-for-go) |
-| Ruby | [azure_event_grid](https://rubygems.org/gems/azure_event_grid) |
+| Programming language | Package | Reference documentation |  Samples | 
+| -------------------- | ---------- | ------------------- | -------- |
+| REST API | | [REST reference](/rest/api/eventgrid/dataplanepreview-version2023-06-01/publish-cloud-events) |
+| .NET | [Azure.Messaging.EventGrid](https://www.nuget.org/packages/Azure.Messaging.EventGrid/) | [.NET reference](/dotnet/api/overview/azure/messaging.eventgrid-readme?view=azure-dotnet-preview&preserve-view=true) | [.NET samples](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/eventgrid/Azure.Messaging.EventGrid/samples) |
+|Java | [azure-messaging-eventgrid](https://central.sonatype.com/artifact/com.azure/azure-messaging-eventgrid/) |  [Java reference](/java/api/overview/azure/messaging-eventgrid-readme?view=azure-java-preview&preserve-view=true) | [Java samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/eventgrid/azure-messaging-eventgrid/src/samples/java) |
+| JavaScript | [@azure/eventgrid](https://www.npmjs.com/package/@azure/eventgrid) | [JavaScript reference](/javascript/api/overview/azure/eventgrid-readme?view=azure-node-preview&preserve-view=true) | [JavaScript and TypeScript samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/eventgrid/eventgrid) |
+| Python | [azure-eventgrid](https://pypi.org/project/azure-eventgrid/) | [Python reference](/python/api/overview/azure/eventgrid-readme?view=azure-python-preview&preserve-view=true) | [Python samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-eventgrid/samples) |
+| Go | [Azure SDK for Go](https://github.com/Azure/azure-sdk-for-go) | | |
 
 
 ## Next steps

articles/event-grid/toc.yml

@@ -70,6 +70,8 @@ items:
         href: mqtt-troubleshoot-errors.md
     - name: Reference
       items:
+      - name: SDKs
+        href: sdk-overview.md
       - name: Azure CLI
         href: /cli/azure/eventgrid
       - name: PowerShell
@@ -126,6 +128,8 @@ items:
         href: create-view-manage-event-subscriptions.md
     - name: Reference
       items:
+      - name: SDKs
+        href: sdk-overview.md
       - name: Azure CLI
         href: /cli/azure/eventgrid
       - name: PowerShell
@@ -522,6 +526,8 @@ items:
           href: troubleshoot-subscription-validation.md
     - name: Reference
       items:
+      - name: SDKs
+        href: sdk-overview.md
       - name: Azure CLI
         href: /cli/azure/eventgrid
       - name: PowerShell
@@ -548,8 +554,6 @@ items:
           href: /azure/templates/microsoft.eventgrid/eventsubscriptions
         - name: Topics
           href: /azure/templates/microsoft.eventgrid/topics
-      - name: SDKs
-        href: sdk-overview.md
       - name: Transition from Event Grid on IoT Edge to Azure IoT Edge
         href: transition.md
     - name: Resources

articles/machine-learning/how-to-managed-network.md

@@ -647,7 +647,7 @@ To enable the [serverless spark jobs](how-to-submit-spark-jobs.md) for the manag
     # whether to provision spark vnet as well
     include_spark = True
 
-    provision_network_result = ml_client.workspaces.begin_provision_network(ws_name, include_spark).result()
+    provision_network_result = ml_client.workspaces.begin_provision_network(workspace_name=ws_name, include_spark=include_spark).result()
     ```
 
     # [Azure portal](#tab/portal)