Merge pull request #179901 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.azure-web-pubsub.json

@@ -4,16 +4,6 @@
             "source_path_from_root": "/articles/azure-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
             "redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
             "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/azure-web-pubsub/reference-server-sdk-csharp.md",
-          "redirect_url": "/dotnet/api/overview/azure/webpubsub/client",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/azure-web-pubsub/reference-server-sdk-java.md",
-          "redirect_url": "/java/api/overview/azure/webpubsub/client",
-          "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -26376,6 +26376,11 @@
       "redirect_url": "/azure/sentinel/data-connectors-reference#zscaler",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/sentinel/watchlist-with-rest-api.md",
+      "redirect_url": "/rest/api/securityinsights/watchlists",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/service-bus/index.md",
       "redirect_url": "/azure/service-bus-messaging/index",

articles/aks/concepts-security.md

@@ -130,7 +130,7 @@ To limit network traffic between pods in your cluster, AKS offers support for [K
 
 ## Application Security
 
-To protect pods running on AKS leverage [Azure Defender for Kubernetes][azure-defender-for-kubernetes] to detect and restrict cyber attacks against your applications running in your pods.  Run continual scanning to detect drift in the vulnerability state of your application and implement a "blue/green/canary" process to patch and replace the vulnerable images. 
+To protect pods running on AKS leverage [Microsoft Defender for Kubernetes][azure-defender-for-kubernetes] to detect and restrict cyber attacks against your applications running in your pods.  Run continual scanning to detect drift in the vulnerability state of your application and implement a "blue/green/canary" process to patch and replace the vulnerable images. 
 
 
 ## Kubernetes Secrets

articles/automation/overview.md

@@ -111,10 +111,10 @@ Depending on your requirements, one or more of the following Azure services inte
 
 These Azure services can work with Automation job and runbook resources using an HTTP webhook or API method:
 
-* [Azure Logic Apps](/connectors/built-in.md)
-* [Azure Power Apps](/connectors/azureautomation.md)
+* [Azure Logic Apps](/azure/connectors/built-in)
+* [Azure Power Apps](/connectors/azureautomation)
 * [Azure Event Grid](../event-grid/handler-webhooks.md)
-* [Azure Power Automate](/connectors/azureautomation.md)
+* [Azure Power Automate](/connectors/azureautomation)
 
 [!INCLUDE [azure-lighthouse-supported-service](../../includes/azure-lighthouse-supported-service.md)]
 
@@ -125,4 +125,4 @@ You can review the prices associated with Azure Automation on the [pricing](http
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Create an Automation account](./quickstarts/create-account-portal.md)
+> [Create an Automation account](./quickstarts/create-account-portal.md)

articles/azure-monitor/logs/logicapp-flow-connector.md

@@ -16,7 +16,7 @@ For example, you can create a logic app to use Azure Monitor log data in an emai
 
 ## Connector limits
 The Azure Monitor Logs connector has these limits:
-* Max query response size ~16.7 MB MB (16 MiB). Connector infrastructure dictates that limit is set lower than query API limit
+* Max query response size ~16.7 MB (16 MiB). Connector infrastructure dictates that limit is set lower than query API limit
 * Max number of records: 500,000
 * Max query timeout 110 second
 * Chart visualizations could be available in Logs page and missing in the connector since the connector and Logs page don't use the same charting libraries currently

articles/azure-monitor/logs/logs-data-export.md

@@ -69,7 +69,7 @@ Log Analytics workspace data export continuously exports data from a Log Analyti
     - West US 2
 
 ## Data completeness
-Data export will continue to retry sending data for up to 30 minutes if the destination is unavailable. If it's still unavailable after 30 minutes, data will be discarded until the destination becomes available.
+Data export is optimized for moving large data volume to your destinations and in certain retry conditions, can include a fraction of duplicated records. The export operation to your destination could fail when ingress limits are reached, see details under [Create or update data export rule](#create-or-update-data-export-rule). Export continues to retry for up to 30 minutes and if destination is unavailable to accept data, data will be discarded until the destination becomes available.
 
 ## Cost
 Currently, there are no additional charges for the data export feature. Pricing for data export will be announced in the future and a notice period provided prior to the start of billing. If you choose to continue using data export after the notice period, you will be billed at the applicable rate.

articles/azure-web-pubsub/media/sdk-reference/event-handler-middleware.png

@@ -66,27 +66,26 @@ In this tutorial, you learn how to:
     func init --worker-runtime dotnet
     ```
 
-1. Install `Microsoft.Azure.WebJobs.Extensions.WebPubSub` function extension package explicitly.
+2. *Install `Microsoft.Azure.WebJobs.Extensions.WebPubSub` function extension package.
 
-   1. Remove `extensionBundle` section in `host.json` to enable install specific extension package in next step. Or simply make host json as simple a below.
+    > [!NOTE]
+    > The step will be optional when [Extension bundles](/azure/azure-functions/functions-bindings-register#extension-bundles) are supported.
 
-      ```json
-      {
+   a. Remove `extensionBundle` section in `host.json` to enable install specific extension package in next step. Or simply make host json as simple a below.
+    ```json
+    {
         "version": "2.0"
-      }
-      ```
-
-   1. Run command to install specific function extension package.
-
-      ```bash
-      func extensions install --package Microsoft.Azure.WebJobs.Extensions.WebPubSub --version 1.0.0-beta.3
-      ```
+    }
+    ```
+   b. Run command to install specific function extension package.
+    ```bash
+    func extensions install --package Microsoft.Azure.WebJobs.Extensions.WebPubSub --version 1.0.0
+    ```
 
-1. Create an `index` function to read and host a static web page for clients.
+3. Create an `index` function to read and host a static web page for clients.
     ```bash
     func new -n index -t HttpTrigger
     ```
-
    # [JavaScript](#tab/javascript)
    - Update `index/function.json` and copy following json codes.
         ```json
@@ -113,18 +112,26 @@ In this tutorial, you learn how to:
    - Update `index/index.js` and copy following codes.
         ```js
         var fs = require('fs');
+        var path = require('path');
+
         module.exports = function (context, req) {
-            fs.readFile('index.html', 'utf8', function (err, data) {
+            var index = 'index.html';
+            if (process.env["HOME"] != null)
+            {
+                index = path.join(process.env["HOME"], "site", "wwwroot", index);
+            }
+            context.log("index.html path: " + index);
+            fs.readFile(index, 'utf8', function (err, data) {
                 if (err) {
-                    console.log(err);
-                    context.done(err);
+                console.log(err);
+                context.done(err);
                 }
                 context.res = {
-                    status: 200,
-                    headers: {
-                        'Content-Type': 'text/html'
-                    },
-                    body: data
+                status: 200,
+                headers: {
+                    'Content-Type': 'text/html'
+                },
+                body: data
                 };
                 context.done();
             });
@@ -137,15 +144,21 @@ In this tutorial, you learn how to:
         [FunctionName("index")]
         public static IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous)] HttpRequest req)
         {
+            string indexFile = "index.html";
+            if (Environment.GetEnvironmentVariable("HOME") != null)
+            {
+                indexFile = Path.Join(Environment.GetEnvironmentVariable("HOME"), "site", "wwwroot", indexFile);
+            }
+            log.LogInformation($"index.html path: {indexFile}.");
             return new ContentResult
             {
-                Content = File.ReadAllText("index.html"),
+                Content = File.ReadAllText(indexFile),
                 ContentType = "text/html",
             };
         }
         ```
 
-1. Create a `negotiate` function to help clients get service connection url with access token.
+4. Create a `negotiate` function to help clients get service connection url with access token.
     ```bash
     func new -n negotiate -t HttpTrigger
     ```
@@ -199,7 +212,7 @@ In this tutorial, you learn how to:
         }
         ```
 
-2. Create a `message` function to broadcast client messages through service.
+5. Create a `message` function to broadcast client messages through service.
    ```bash
    func new -n message -t HttpTrigger
    ```
@@ -215,15 +228,14 @@ In this tutorial, you learn how to:
                 {
                     "type": "webPubSubTrigger",
                     "direction": "in",
-                    "name": "message",
-                    "dataType": "binary",
+                    "name": "data",
                     "hub": "simplechat",
                     "eventName": "message",
                     "eventType": "user"
                 },
                 {
                     "type": "webPubSub",
-                    "name": "webPubSubEvent",
+                    "name": "actions",
                     "hub": "simplechat",
                     "direction": "out"
                 }
@@ -232,15 +244,15 @@ In this tutorial, you learn how to:
         ```
    - Update `message/index.js` and copy following codes.
         ```js
-        module.exports = async function (context, message) {
-            context.bindings.webPubSubEvent = {
-                "operationKind": "sendToAll",
-                "message": `[${context.bindingData.connectionContext.userId}] ${message}`,
+        module.exports = async function (context, data) {
+            context.bindings.actions = {
+                "actionName": "sendToAll",
+                "data": `[${context.bindingData.request.connectionContext.userId}] ${data}`,
                 "dataType": context.bindingData.dataType
             };
-            // MessageResponse directly return to caller
+            // UserEventResponse directly return to caller
             var response = { 
-                "message": '[SYSTEM] ack.',
+                "data": '[SYSTEM] ack.',
                 "dataType" : "text"
             };
             return response;
@@ -251,26 +263,25 @@ In this tutorial, you learn how to:
    - Update `message.cs` and replace `Run` function with following codes.
         ```c#
         [FunctionName("message")]
-        public static async Task<MessageResponse> Run(
-            [WebPubSubTrigger(WebPubSubEventType.User, "message")] ConnectionContext context,
-            BinaryData message,
-            MessageDataType dataType,
-            [WebPubSub(Hub = "simplechat")] IAsyncCollector<WebPubSubOperation> operations)
+        public static async Task<UserEventResponse> Run(
+            [WebPubSubTrigger(WebPubSubEventType.User, "message")] UserEventRequest request,
+            BinaryData data,
+            WebPubSubDataType dataType,
+            [WebPubSub(Hub = "simplechat")] IAsyncCollector<WebPubSubAction> actions)
         {
-            await operations.AddAsync(new SendToAll
-            {
-                Message = BinaryData.FromString($"[{context.UserId}] {message.ToString()}"),
-                DataType = dataType
-            });
-            return new MessageResponse
+            await actions.AddAsync(WebPubSubAction.CreateSendToAllAction(
+                BinaryData.FromString($"[{request.ConnectionContext.UserId}] {message.ToString()}"),
+                dataType
+            );
+            return new UserEventResponse
             {
-                Message = BinaryData.FromString("[SYSTEM] ack"),
-                DataType = MessageDataType.Text
+                Data = BinaryData.FromString("[SYSTEM] ack"),
+                DataType = WebPubSubDataType.Text
             };
         }
         ```
 
-3. Add the client single page `index.html` in the project root folder and copy content as below.
+6. Add the client single page `index.html` in the project root folder and copy content as below.
     ```html
     <html>
         <body>
@@ -384,7 +395,7 @@ Use the following commands to create these items.
 
 ## Configure the Web PubSub service `Event Handler`
 
-In this sample, we're using `WebPubSubTrigger` to listen to service upstream message requests. So Web PubSub need to know the function's endpoint information in order to send target client requests. And Azure Function App requires a system key for security regarding extension-specific webhook methods. In the previous step after we deployed the Function App with `message` functions, we're able to get the system key.
+In this sample, we're using `WebPubSubTrigger` to listen to service upstream requests. So Web PubSub need to know the function's endpoint information in order to send target client requests. And Azure Function App requires a system key for security regarding extension-specific webhook methods. In the previous step after we deployed the Function App with `message` functions, we're able to get the system key.
 
 Go to **Azure portal** -> Find your Function App resource -> **App keys** -> **System keys** -> **`webpubsub_extension`**. Copy out the value as `<APP_KEY>`.