Skip to content

Commit 1d8a9f8

Browse files
authored
Merge pull request #226760 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c95f5e3 + 35926e2 commit 1d8a9f8

27 files changed

+57
-33
lines changed

articles/aks/learn/quick-windows-container-deploy-powershell.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,20 @@ creating a node pool to run Windows Server containers, the default value for `-V
125125
[restricted VM sizes][restricted-vm-sizes]. The minimum recommended size is **Standard_D2s_v3**. The
126126
previous command also uses the default subnet in the default vnet created when running `New-AzAksCluster`.
127127

128+
## Add a Windows Server 2019 or Windows Server 2022 node pool
129+
130+
AKS supports Windows Server 2019 and 2022 node pools. For Kubernetes version 1.25.0 and higher, Windows Server 2022 is the default operating system. For earlier Kubernetes versions, Windows Server 2019 is the default OS. To use Windows Server 2019, you need to specify the following parameters:
131+
- **osType** set the value to `Windows`
132+
- **osSKU** set the value to `Windows2019`
133+
134+
> [!NOTE]
135+
> OsSKU requires PowerShell Az module version "9.2.0" or higher.
136+
> Windows Server 2022 requires Kubernetes version "1.23.0" or higher.
137+
138+
```azurepowershell-interactive
139+
New-AzAksNodePool -ResourceGroupName myResourceGroup -ClusterName myAKSCluster -VmSetType VirtualMachineScaleSets -OsType Windows -OsSKU Windows2019 Windows -Name npwin
140+
```
141+
128142
## Connect to the cluster
129143

130144
To manage a Kubernetes cluster, you use [kubectl][kubectl], the Kubernetes command-line client. If

articles/api-management/export-api-power-platform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This article walks through the steps in the Azure portal to create a custom Powe
3737

3838
:::image type="content" source="media/export-api-power-platform/create-custom-connector.png" alt-text="Create custom connector to API in API Management":::
3939

40-
Once the connector is created, navigate to your [Power Apps](https://make.powerapps.com) or [Power Automate](https://flow.microsoft.com) environment. You will see the API listed under **Data > Custom Connectors**.
40+
Once the connector is created, navigate to your [Power Apps](https://make.powerapps.com) or [Power Automate](https://make.powerautomate.com) environment. You will see the API listed under **Data > Custom Connectors**.
4141

4242
:::image type="content" source="media/export-api-power-platform/custom-connector-power-app.png" alt-text="Custom connector in Power Platform":::
4343

@@ -49,7 +49,7 @@ You can manage your custom connector in your Power Apps or Power Platform enviro
4949
1. Select the pencil (Edit) icon to edit and test the custom connector.
5050

5151
> [!NOTE]
52-
> To call the API from the Power Apps test console, you need to add the `https://flow.microsoft.com` URL as an origin to the [CORS policy](cors-policy.md) in your API Management instance.
52+
> To call the API from the Power Apps test console, you need to add the `https://make.powerautomate.com` URL as an origin to the [CORS policy](cors-policy.md) in your API Management instance.
5353
5454
## Update a custom connector
5555

articles/azure-functions/functions-compare-logic-apps-ms-flow-webjobs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: mvc
1010

1111
This article compares the following Microsoft cloud services:
1212

13-
* [Microsoft Power Automate](https://flow.microsoft.com/) (was Microsoft Flow)
13+
* [Microsoft Power Automate](https://make.powerautomate.com/) (was Microsoft Flow)
1414
* [Azure Logic Apps](https://azure.microsoft.com/services/logic-apps/)
1515
* [Azure Functions](https://azure.microsoft.com/services/functions/)
1616
* [Azure App Service WebJobs](../app-service/webjobs-create.md)
@@ -37,7 +37,7 @@ The following table helps you determine whether Power Automate or Logic Apps is
3737
| **Scenarios** |Self-service |Advanced integrations |
3838
| **Design tool** |In-browser and mobile app, UI only |In-browser, [Visual Studio Code](../logic-apps/quickstart-create-logic-apps-visual-studio-code.md), and [Visual Studio](../logic-apps/quickstart-create-logic-apps-with-visual-studio.md) with code view available |
3939
| **Application lifecycle management (ALM)** |Design and test in non-production environments, promote to production when ready |Azure DevOps: source control, testing, support, automation, and manageability in [Azure Resource Manager](../logic-apps/logic-apps-azure-resource-manager-templates-overview.md) |
40-
| **Admin experience** |Manage Power Automate environments and data loss prevention (DLP) policies, track licensing: [Admin center](https://admin.flow.microsoft.com) |Manage resource groups, connections, access management, and logging: [Azure portal](https://portal.azure.com) |
40+
| **Admin experience** |Manage Power Automate environments and data loss prevention (DLP) policies, track licensing: [Admin center](https://admin.powerplatform.microsoft.com) |Manage resource groups, connections, access management, and logging: [Azure portal](https://portal.azure.com) |
4141
| **Security** |Microsoft 365 security audit logs, DLP, [encryption at rest](https://wikipedia.org/wiki/Data_at_rest#Encryption) for sensitive data |Security assurance of Azure: [Azure security](https://www.microsoft.com/en-us/trustcenter/Security/AzureSecurity), [Microsoft Defender for Cloud](https://azure.microsoft.com/services/security-center/), [audit logs](https://azure.microsoft.com/blog/azure-audit-logs-ux-refresh/) |
4242

4343
## Compare Azure Functions and Azure Logic Apps

articles/azure-monitor/app/automate-custom-reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ These steps only apply if you don't already have a SendGrid account configured.
148148
* Learn more about creating [Analytics queries](../logs/get-started-queries.md).
149149
* Learn more about [programmatically querying Application Insights data](/rest/api/application-insights/)
150150
* Learn more about [Logic Apps](../../logic-apps/logic-apps-overview.md).
151-
* Learn more about [Power Automate](https://ms.flow.microsoft.com).
151+
* Learn more about [Power Automate](https://make.powerautomate.com).

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 03/22/2022
1111
---
1212

1313
# Azure Monitor Logs connector for Logic Apps and Power Automate
14-
[Azure Logic Apps](../../logic-apps/index.yml) and [Power Automate](https://flow.microsoft.com) allow you to create automated workflows using hundreds of actions for various services. The Azure Monitor Logs connector allows you to build workflows that retrieve data from a Log Analytics workspace or an Application Insights application in Azure Monitor. This article describes the actions included with the connector and provides a walkthrough to build a workflow using this data.
14+
[Azure Logic Apps](../../logic-apps/index.yml) and [Power Automate](https://make.powerautomate.com) allow you to create automated workflows using hundreds of actions for various services. The Azure Monitor Logs connector allows you to build workflows that retrieve data from a Log Analytics workspace or an Application Insights application in Azure Monitor. This article describes the actions included with the connector and provides a walkthrough to build a workflow using this data.
1515

1616
For example, you can create a logic app to use Azure Monitor log data in an email notification from Office 365, create a bug in Azure DevOps, or post a Slack message. You can trigger a workflow by a simple schedule or from some action in a connected service such as when a mail or a tweet is received.
1717

@@ -131,4 +131,4 @@ This tutorial shows how to create a logic app that sends the results of an Azure
131131
132132
- Learn more about [log queries in Azure Monitor](./log-query-overview.md).
133133
- Learn more about [Logic Apps](../../logic-apps/index.yml)
134-
- Learn more about [Power Automate](https://flow.microsoft.com).
134+
- Learn more about [Power Automate](https://make.powerautomate.com).

articles/azure-monitor/logs/logs-export-logic-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@ Go to the **Storage accounts** menu in the Azure portal and select your storage
204204
205205
- Learn more about [log queries in Azure Monitor](./log-query-overview.md).
206206
- Learn more about [Logic Apps](../../logic-apps/index.yml).
207-
- Learn more about [Power Automate](https://flow.microsoft.com).
207+
- Learn more about [Power Automate](https://make.powerautomate.com).

articles/azure-video-indexer/logic-apps-connector-arm-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Azure Video Indexer (AVI) [REST API](https://api-portal.videoindexer.ai/api-deta
1313
> [!TIP]
1414
> For the latest `api-version`, chose the latest stable version in [our REST documentation](/rest/api/videoindexer/stable/generate).
1515
16-
To make the integration easier, we support [Logic Apps](https://azure.microsoft.com/services/logic-apps/) and [Power Automate](https://preview.flow.microsoft.com/connectors/shared_videoindexer-v2/video-indexer-v2/) connectors that are compatible with the Azure Video Indexer API.
16+
To make the integration easier, we support [Logic Apps](https://azure.microsoft.com/services/logic-apps/) and [Power Automate](https://make.powerautomate.com/connectors/shared_videoindexer-v2/video-indexer-v2/) connectors that are compatible with the Azure Video Indexer API.
1717

1818
You can use the connectors to set up custom workflows to effectively index and extract insights from a large amount of video and audio files, without writing a single line of code. Furthermore, using the connectors for the integration gives you better visibility on the health of your workflow and an easy way to debug it.
1919

articles/azure-video-indexer/logic-apps-connector-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 09/21/2020
1010

1111
Azure Video Indexer [REST API](https://api-portal.videoindexer.ai/api-details#api=Operations&operation=Delete-Video) supports both server-to-server and client-to-server communication and enables Azure Video Indexer users to integrate video and audio insights easily into their application logic, unlocking new experiences and monetization opportunities.
1212

13-
To make the integration even easier, we support [Logic Apps](https://azure.microsoft.com/services/logic-apps/) and [Power Automate](https://preview.flow.microsoft.com/connectors/shared_videoindexer-v2/video-indexer-v2/) connectors that are compatible with our API. You can use the connectors to set up custom workflows to effectively index and extract insights from a large amount of video and audio files, without writing a single line of code. Furthermore, using the connectors for your integration gives you better visibility on the health of your workflow and an easy way to debug it. 
13+
To make the integration even easier, we support [Logic Apps](https://azure.microsoft.com/services/logic-apps/) and [Power Automate](https://make.powerautomate.com/connectors/shared_videoindexer-v2/video-indexer-v2/) connectors that are compatible with our API. You can use the connectors to set up custom workflows to effectively index and extract insights from a large amount of video and audio files, without writing a single line of code. Furthermore, using the connectors for your integration gives you better visibility on the health of your workflow and an easy way to debug it. 
1414

1515
To help you get started quickly with the Azure Video Indexer connectors, we will do a walkthrough of an example Logic App and Power Automate solution you can set up. This tutorial shows how to set up flows using Logic Apps. However, the editors and capabilities are almost identical in both solutions, thus the diagrams and explanations are applicable to both Logic Apps and Power Automate.
1616

articles/cognitive-services/language-service/named-entity-recognition/tutorials/extract-excel-information.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The issues are reported in raw text. We will use the NER feature to extract the
4545

4646
## Create a new Power Automate workflow
4747

48-
Go to the [Power Automate site](https://preview.flow.microsoft.com/), and login. Then click **Create** and **Scheduled flow**.
48+
Go to the [Power Automate site](https://make.powerautomate.com/), and login. Then click **Create** and **Scheduled flow**.
4949

5050
:::image type="content" source="../media/tutorials/excel/flow-creation.png" alt-text="The workflow creation screen" lightbox="../media/tutorials/excel/flow-creation.png":::
5151

articles/connectors/connectors-integrate-security-operations-create-api-microsoft-graph-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ With [Azure Logic Apps](../logic-apps/logic-apps-overview.md) and the [Microsoft
2525

2626
Your logic app's workflow can use actions that get responses from the Microsoft Graph Security connector and make that output available to other actions in your workflow. You can also have other actions in your workflow use the output from the Microsoft Graph Security connector actions. For example, if you get high severity alerts through the Microsoft Graph Security connector, you can send those alerts in an email message by using the Outlook connector.
2727

28-
To learn more about Microsoft Graph Security, see the [Microsoft Graph Security API overview](/graph/security-concept-overview). If you're new to logic apps, review [What is Azure Logic Apps?](../logic-apps/logic-apps-overview.md). If you're looking for Power Automate or Power Apps, see [What is Power Automate?](https://flow.microsoft.com/) or [What is Power Apps?](https://powerapps.microsoft.com/)
28+
To learn more about Microsoft Graph Security, see the [Microsoft Graph Security API overview](/graph/security-concept-overview). If you're new to logic apps, review [What is Azure Logic Apps?](../logic-apps/logic-apps-overview.md). If you're looking for Power Automate or Power Apps, see [What is Power Automate?](https://make.powerautomate.com/) or [What is Power Apps?](https://powerapps.microsoft.com/)
2929

3030
## Prerequisites
3131

0 commit comments

Comments
 (0)