Merge pull request #259924 from MicrosoftDocs/main

11/30/2023 AM Publish

Author: Taojunshen

.openpublishing.redirection.virtual-desktop.json

@@ -234,6 +234,11 @@
             "source_path_from_root": "/articles/virtual-desktop/required-url-check-tool.md",
             "redirect_url": "/azure/virtual-desktop/check-access-validate-required-fqdn-endpoint",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/troubleshoot-statuses-checks.md",
+            "redirect_url": "/azure/virtual-desktop/session-host-status-health-checks",
+            "redirect_document_id": true
         }
     ]
 }

articles/ai-services/document-intelligence/toc.yml

@@ -13,6 +13,7 @@ items:
     displayName: get started
     href: studio-overview.md
   - name: Document Intelligence SDKs
+    expanded: true
     items:
       - name: Changelog and release history
         displayName: latest, update, beta, package, preview, version

articles/aks/operator-best-practices-advanced-scheduler.md

@@ -160,8 +160,7 @@ spec:
         cpu: 4.0
         memory: 16Gi
   nodeSelector:
-      hardware:
-      values: highmem
+      hardware: highmem
 ```
 
 When you use these scheduler options, work with your application developers and owners to allow them to correctly define their pod specifications.
@@ -247,4 +246,4 @@ This article focused on advanced Kubernetes scheduler features. For more informa
 [aks-best-practices-isolation]: operator-best-practices-cluster-isolation.md
 [use-multiple-node-pools]: create-node-pools.md
 [taint-node-pool]: manage-node-pools.md#specify-a-taint-label-or-tag-for-a-node-pool
-[use-gpus-aks]: gpu-cluster.md
+[use-gpus-aks]: gpu-cluster.md

articles/azure-arc/resource-bridge/overview.md

@@ -144,6 +144,6 @@ Arc resource bridge typically releases a new version on a monthly cadence, at th
 ## Next steps
 
 * Learn how [Azure Arc-enabled VMware vSphere extends Azure's governance and management capabilities to VMware vSphere infrastructure](../vmware-vsphere/overview.md).
-* Learn how [Azure Arc-enabled SCVMM extends Azure's governance and management capabilities to System Center managed infrastructure(../system-center-virtual-machine-manager/overview.md).
+* Learn how [Azure Arc-enabled SCVMM extends Azure's governance and management capabilities to System Center managed infrastructure](../system-center-virtual-machine-manager/overview.md).
 * Learn about [provisioning and managing on-premises Windows and Linux VMs running on Azure Stack HCI clusters](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines).
 * Review the [system requirements](system-requirements.md) for deploying and managing Arc resource bridge.

articles/azure-functions/functions-bindings-warmup.md

@@ -84,17 +84,9 @@ public void warmup( @WarmupTrigger Object warmupContext, ExecutionContext contex
 
 # [Model v4](#tab/nodejs-v4)
 
-The following example shows a warmup trigger [JavaScript function](functions-reference-node.md) that runs on each new instance when added to your app.
+The following example shows a [JavaScript function](functions-reference-node.md) with a warmup trigger that runs on each new instance when added to your app:
 
-```javascript
-import { app } from "@azure/functions";
-
-app.warmup('warmupTrigger1', {
-    handler: (warmupContext, context) => {
-        context.log('Function App instance is warm.');
-    },
-});
-```
+:::code language="javascript" source="~/azure-functions-nodejs-v4/js/src/functions/warmupTrigger1.js" :::
 
 # [Model v3](#tab/nodejs-v3)
 
@@ -124,27 +116,21 @@ module.exports = async function (warmupContext, context) {
 };
 ```
 
+---
+
 ::: zone-end
 ::: zone pivot="programming-language-typescript"
 # [Model v4](#tab/nodejs-v4)
 
-The following example shows a warmup trigger [JavaScript function](functions-reference-node.md) that runs on each new instance when added to your app.
+The following example shows a [TypeScript function](functions-reference-node.md) with a warmup trigger that runs on each new instance when added to your app:
 
-```TypeScript
-import { app, InvocationContext, WarmupContextOptions } from "@azure/functions";
-
-export async function warmupFunction(warmupContext: WarmupContextOptions, context: InvocationContext): Promise<void> {
-    context.log('Function App instance is warm.');
-}
-
-app.warmup('warmup', {
-    handler: warmupFunction,
-});
-```
+:::code language="typescript" source="~/azure-functions-nodejs-v4/ts/src/functions/warmupTrigger1.ts" :::
 
 # [Model v3](#tab/nodejs-v3)
 TypeScript samples aren't documented for model v3.
 
+---
+
 ::: zone-end
 ::: zone pivot="programming-language-powershell"  
 Here's the *function.json* file:

articles/azure-monitor/app/java-standalone-telemetry-processors-examples.md

@@ -534,7 +534,7 @@ Let's assume the input log message body is `User account with userId 123456xx fa
         "body": {
           "toAttributes": {
             "rules": [
-              "^User account with userId (?<redactedUserId>\\d+) .*"
+              "^User account with userId (?<redactedUserId>[\\da-zA-Z]+)[\\w\\s]+"
             ]
           }
         }

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

@@ -1196,13 +1196,13 @@ The simplest way to add your own spans is by using OpenTelemetry's `@WithSpan` a
 
 Spans populate the `requests` and `dependencies` tables in Application Insights.
 
-1. Add `opentelemetry-instrumentation-annotations-1.21.0.jar` (or later) to your application:
+1. Add `opentelemetry-instrumentation-annotations-1.32.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry.instrumentation</groupId>
      <artifactId>opentelemetry-instrumentation-annotations</artifactId>
-     <version>1.21.0</version>
+     <version>1.32.0</version>
    </dependency>
    ```
 
@@ -1398,7 +1398,7 @@ Not available in .NET.
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>applicationinsights-core</artifactId>
-      <version>3.4.14</version>
+      <version>3.4.18</version>
     </dependency>
     ```
 

articles/azure-monitor/logs/log-analytics-overview.md

@@ -35,7 +35,12 @@ If you want to start with an empty script and write it yourself, close the examp
 
 ## Log Analytics interface
 
-The following image identifies four Log Analytics components.
+The following image identifies four Log Analytics components. These four Log Analytics components are:
+
+1. [Top action bar](#top-action-bar)
+1. [Left sidebar](#left-sidebar)
+1. [Query window](#query-window)
+1. [Results window](#results-window)
 
 :::image type="content" source="media/log-analytics-overview/log-analytics.png" lightbox="media/log-analytics-overview/log-analytics.png" alt-text="Screenshot that shows the Log Analytics interface with four features identified.":::
 

articles/backup/azure-kubernetes-service-backup-overview.md

@@ -5,7 +5,7 @@ ms.topic: conceptual
 ms.service: backup
 ms.custom:
   - ignite-2023
-ms.date: 11/14/2023
+ms.date: 11/30/2023
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---
@@ -69,9 +69,6 @@ You  can now use the Custom Hooks capability available in Azure Backup for AKS.
 
 Azure Backup for AKS enables you to execute Custom Hooks as part of the backup and restore operation. Hooks are commands configured to run one or more commands to execute in a pod under a container during the backup operation or after restore. They allow you to define these hooks as a custom resource and deploy in the AKS cluster to be backed up or restored. Once the custom resource is deployed in the AKS cluster in the required Namespace, you need to provide the details as input for the Configure Backup/Restore flow, and the Backup extension runs the hooks as defined in the YAML file.
 
->[!Note]
->Hooks aren't executed in a *shell* on the containers.
-
 There are two types of hooks:
 
 ### Backup Hooks
@@ -88,43 +85,45 @@ metadata:
   name: bkphookname0
   namespace: default
 spec:
-  # BackupHook Name. This is the name of the hook that will be executed during backup.
-  # compulsory
-  name: hook1
-  # Namespaces where this hook will be executed.
-  includedNamespaces: 
-  - hrweb
-  excludedNamespaces:
-  labelSelector:
-  # PreHooks is a list of BackupResourceHooks to execute prior to backing up an item.
-  preHooks:
-    - exec:
-        # Container is the container in the pod where the command should be executed.
-        container: webcontainer
-        # Command is the command and arguments to execute.
-        command:
-          - /bin/uname
-          - -a
-        # OnError specifies how Velero should behave if it encounters an error executing this hook  
-        onError: Continue
-        # Timeout is the amount of time to wait for the hook to complete before considering it failed.
-        timeout: 10s
-    - exec:
-        command:
-        - /bin/bash
-        - -c
-        - echo hello > hello.txt && echo goodbye > goodbye.txt
-        container: webcontainer
-        onError: Continue
-  # PostHooks is a list of BackupResourceHooks to execute after backing up an item.
-  postHooks:
-    - exec:
-        container: webcontainer
-        command:
-          - /bin/uname
-          - -a
-        onError: Continue
-        timeout: 10s
+  # BackupHook is a list of hooks to execute before and after backing up a resource.
+  backupHook:
+    # BackupHook Name. This is the name of the hook that will be executed during backup.
+    # compulsory
+  - name: hook1
+    # Namespaces where this hook will be executed.
+    includedNamespaces: 
+    - hrweb
+    excludedNamespaces:
+    labelSelector:
+    # PreHooks is a list of BackupResourceHooks to execute prior to backing up an item.
+    preHooks:
+      - exec:
+          # Container is the container in the pod where the command should be executed.
+          container: webcontainer
+          # Command is the command and arguments to execute.
+          command:
+            - /bin/uname
+            - -a
+          # OnError specifies how Velero should behave if it encounters an error executing this hook  
+          onError: Continue
+          # Timeout is the amount of time to wait for the hook to complete before considering it failed.
+          timeout: 10s
+      - exec:
+          command:
+            - /bin/bash
+            - -c
+            - echo hello > hello.txt && echo goodbye > goodbye.txt
+          container: webcontainer
+          onError: Continue
+    # PostHooks is a list of BackupResourceHooks to execute after backing up an item.
+    postHooks:
+      - exec:
+          container: webcontainer
+          command:
+            - /bin/uname
+            - -a
+          onError: Continue
+          timeout: 10s
 
 ``` 
 
@@ -141,31 +140,31 @@ metadata:
   name: restorehookname0
   namespace: default
 spec:
-  # Name is the name of this hook.
-  name: myhook-1  
-  # Restored Namespaces where this hook will be executed.
-  includedNamespaces: 
-  excludedNamespaces:
-  labelSelector:
-  # PostHooks is a list of RestoreResourceHooks to execute during and after restoring a resource.
-  postHooks:
-    - exec:
-        # Container is the container in the pod where the command should be executed.
-        container: webcontainer
-        # Command is the command and arguments to execute from within a container after a pod has been restored.
-        command:
-          - /bin/bash
-          - -c
-          - echo hello > hello.txt && echo goodbye > goodbye.txt
-        # OnError specifies how Velero should behave if it encounters an error executing this hook
-        # default value is Continue
-        onError: Continue
-        # Timeout is the amount of time to wait for the hook to complete before considering it failed.
-        execTimeout: 30s
-        # WaitTimeout defines the maximum amount of time Velero should wait for the container to be ready before attempting to run the command.
-        waitTimeout: 5m
-
-
+  # RestoreHook is a list of hooks to execute after restoring a resource.
+  restoreHook:
+    # Name is the name of this hook.
+  - name: myhook-1  
+    # Restored Namespaces where this hook will be executed.
+    includedNamespaces: 
+    excludedNamespaces:
+    labelSelector:
+    # PostHooks is a list of RestoreResourceHooks to execute during and after restoring a resource.
+    postHooks:
+      - exec:
+          # Container is the container in the pod where the command should be executed.
+          container: webcontainer
+          # Command is the command and arguments to execute from within a container after a pod has been restored.
+          command:
+            - /bin/bash
+            - -c
+            - echo hello > hello.txt && echo goodbye > goodbye.txt
+          # OnError specifies how Velero should behave if it encounters an error executing this hook
+          # default value is Continue
+          onError: Continue
+          # Timeout is the amount of time to wait for the hook to complete before considering it failed.
+          execTimeout: 30s
+          # WaitTimeout defines the maximum amount of time Velero should wait for the container to be ready before attempting to run the command.
+          waitTimeout: 5m
 
 ```
 

articles/backup/azure-kubernetes-service-cluster-manage-backups.md

@@ -130,10 +130,10 @@ To enable Trusted Access between Backup vault and AKS cluster, use the following
 
    ```azurecli-interactive
    az aks trustedaccess rolebinding create \
-   -g $myResourceGroup \ 
-   --cluster-name $myAKSCluster 
-   -n <randomRoleBindingName> \ 
-   --source-resource-id <vaultID> \ 
+   -g <aksclusterrg> \
+   --cluster-name <aksclustername> \
+   -n <randomRoleBindingName> \
+   --source-resource-id $(az dataprotection backup-vault show -g <vaultrg> -v <VaultName> --query id -o tsv) \
    --roles Microsoft.DataProtection/backupVaults/backup-operator   
    ```