Skip to content

Commit e8447a0

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-nosql-mirroring-fabric
2 parents b902b13 + 227ebac commit e8447a0

31 files changed

+775
-824
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5509,6 +5509,11 @@
55095509
"redirect_url": "/azure/azure-monitor/logs/resource-manager-workspace",
55105510
"redirect_document_id": false
55115511
},
5512+
{
5513+
"source_path_from_root": "/articles/azure-monitor/logs/resource-manager-cluster.md",
5514+
"redirect_url": "/azure/azure-monitor/logs/logs-dedicated-clusters",
5515+
"redirect_document_id": false
5516+
},
55125517
{
55135518
"source_path_from_root": "/articles/azure-monitor/visualize/powerbi.md",
55145519
"redirect_url": "/azure/azure-monitor/logs/log-powerbi",

articles/aks/eks-edw-deploy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In this article, you will deploy an [AWS EDW workload][eks-edw-overview] to Azur
3535
3636
You use the `deploy.sh` script in the `deployment` directory of the [GitHub repository][github-repo] to deploy the application to Azure.
3737
38-
The script first checks that all of the [prerequisite tools][prerequisites] are installed. If not, the script terminates and displays an error message letting you know which prerequisites are missing. If this happens, review the prerequisites, install any missing tools, and then run the script again. You need [Node autoprovisioning (NAP) for AKS] feature flag registered on your Azure subscription. If it isn't already registered, the script executes an Azure CLI command to register the feature flag.
38+
The script first checks that all of the [prerequisite tools][prerequisites] are installed. If not, the script terminates and displays an error message letting you know which prerequisites are missing. If this happens, review the prerequisites, install any missing tools, and then run the script again. The [Node autoprovisioning (NAP) for AKS][nap-aks] feature flag must be registered on your Azure subscription. If it isn't already registered, the script executes an Azure CLI command to register the feature flag.
3939
4040
The script records the state of the deployment in a file called `deploy.state`, which is located in the `deployment` directory. You can use this file to set environment variables when deploying the app.
4141
@@ -304,3 +304,4 @@ For more information on developing and running applications in AKS, see the foll
304304
[helm-aks]: ./kubernetes-helm.md
305305
[k8s-aks]: ./deploy-marketplace.md
306306
[openai-aks]: ./open-ai-quickstart.md
307+
[nap-aks]: ./node-autoprovision.md
16.8 KB
Loading
-30.5 KB
Loading

articles/automation/automation-runbook-execution.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Runbook execution in Azure Automation
33
description: This article provides an overview of the processing of runbooks in Azure Automation.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 12/28/2022
6+
ms.date: 06/27/2024
77
ms.topic: conceptual
88
ms.custom:
99
---
@@ -148,6 +148,7 @@ The following table describes the statuses that are possible for a job. You can
148148
| Stopping |The system is stopping the job. |
149149
| Suspended |Applies to [graphical and PowerShell Workflow runbooks](automation-runbook-types.md) only. The job was suspended by the user, by the system, or by a command in the runbook. If a runbook doesn't have a checkpoint, it starts from the beginning. If it has a checkpoint, it can start again and resume from its last checkpoint. The system only suspends the runbook when an exception occurs. By default, the `ErrorActionPreference` variable is set to Continue, indicating that the job keeps running on an error. If the preference variable is set to Stop, the job suspends on an error. |
150150
| Suspending |Applies to [graphical and PowerShell Workflow runbooks](automation-runbook-types.md) only. The system is trying to suspend the job at the request of the user. The runbook must reach its next checkpoint before it can be suspended. If it has already passed its last checkpoint, it completes before it can be suspended. |
151+
| New | The job has been submitted recently but is not yet activated.|
151152

152153
## Activity logging
153154

articles/automation/how-to/automation-region-dns-records.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Datacenter DNS records used by Azure Automation | Microsoft Docs
33
description: This article provides the DNS records required by Azure Automation features when restricting communication to a specific Azure region hosting that Automation account.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 06/29/2021
6+
ms.date: 06/28/2024
77
ms.topic: conceptual
88
---
99

@@ -63,6 +63,7 @@ To support [Private Link](../../private-link/private-link-overview.md) in Azure
6363
| China East 2 |`https://<accountId>.webhook.sha2.azure-automation.cn`<br>`https://<accountId>.agentsvc.sha2.azure-automation.cn`<br>`https://<accountId>.jrds.sha2.azure-automation.cn` |
6464
| China North |`https://<accountId>.webhook.bjb.azure-automation.cn`<br>`https://<accountId>.agentsvc.bjb.azure-automation.cn`<br>`https://<accountId>.jrds.bjb.azure-automation.cn` |
6565
| China North 2 |`https://<accountId>.webhook.bjs2.azure-automation.cn`<br>`https://<accountId>.agentsvc.bjs2.azure-automation.cn`<br>`https://<accountId>.jrds.bjs2.azure-automation.cn` |
66+
| China North 3 | `https://<accountId>.webhook.cnn3.azure-automation.cn` </br> `https://<accountId>.agentsvc.cnn3.azure-automation.cn` </br> `https://<accountId>.jrds.cnn3.azure-automation.cn` |
6667
| West Europe |`https://<accountId>.webhook.we.azure-automation.net`<br>`https://<accountId>.agentsvc.we.azure-automation.net`<br>`https://<accountId>.jrds.we.azure-automation.net` |
6768
| North Europe |`https://<accountId>.webhook.ne.azure-automation.net`<br>`https://<accountId>.agentsvc.ne.azure-automation.net`<br>`https://<accountId>.jrds.ne.azure-automation.net` |
6869
| France Central |`https://<accountId>.webhook.fc.azure-automation.net`<br>`https://<accountId>.agentsvc.fc.azure-automation.net`<br>`https://<accountId>.jrds.fc.azure-automation.net` |

articles/azure-arc/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ highlightedContent:
2626
# Card
2727
- title: Azure Arc Jumpstart
2828
itemType: sample
29-
url: https://aka.ms/AzureArcJumpstart/overview/
29+
url: https://aka.ms/ArcJumpstart/
3030
# Card
3131
- title: Azure Arc-enabled servers
3232
itemType: overview

0 commit comments

Comments
 (0)