Skip to content

Commit 025ae20

Browse files
authored
Merge pull request #286116 from MicrosoftDocs/main
9/4/2024 AM Publish
2 parents d5daed1 + 937a63c commit 025ae20

30 files changed

+162
-419
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You've decided to contribute. That's great! To contribute to the documentation,
1212

1313
#### GitHub
1414

15-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
15+
Contributing to the documentation requires a [GitHub account](https://github.com/). If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1616

1717
#### Tools
1818

articles/app-service/configure-authentication-file-based.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ With [App Service authentication](overview-authentication-authorization.md), the
1717
1818
## Enabling file-based configuration
1919

20-
1. Create a new JSON file for your configuration at the root of your project (deployed to D:\home\site\wwwroot in your web / function app). Fill in your desired configuration according to the [file-based configuration reference](#configuration-file-reference). If modifying an existing Azure Resource Manager configuration, make sure to translate the properties captured in the `authsettings` collection into your configuration file.
20+
1. Create a new JSON file for your configuration at the root of your project (deployed to C:\home\site\wwwroot in your web / function app). Fill in your desired configuration according to the [file-based configuration reference](#configuration-file-reference). If modifying an existing Azure Resource Manager configuration, make sure to translate the properties captured in the `authsettings` collection into your configuration file.
2121

2222
2. Modify the existing configuration, which is captured in the [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs under `Microsoft.Web/sites/<siteName>/config/authsettingsV2`. To modify it, you can use an [Azure Resource Manager template](../azure-resource-manager/templates/overview.md) or a tool like [Azure Resource Explorer](https://resources.azure.com/). Within the authsettingsV2 collection, set two properties (you may remove others):
2323

articles/app-service/deploy-local-git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ When you push commits to your App Service repository, App Service deploys the fi
147147
git push azure main
148148
```
149149

150-
You can also change the `DEPLOYMENT_BRANCH` app setting in the Azure portal, by selecting **Configuration** under **Settings** and adding a new Application Setting with a name of `DEPLOYMENT_BRANCH` and value of `main`.
150+
You can also change the `DEPLOYMENT_BRANCH` app setting in the Azure portal, by selecting **Environment variables** under **Settings** and adding a new App setting with a name of `DEPLOYMENT_BRANCH` and value of `main`.
151151

152152
## Troubleshoot deployment
153153

articles/app-service/deploy-run-package.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ The command also restarts the app. Because `WEBSITE_RUN_FROM_PACKAGE` is set, Ap
5454

5555
## Run from external URL instead
5656

57-
You can also run a package from an external URL, such as Azure Blob Storage. You can use the [Azure Storage Explorer](../vs-azure-tools-storage-manage-with-storage-explorer.md) to upload package files to your Blob storage account. You should use a private storage container with a [Shared Access Signature (SAS)](../vs-azure-tools-storage-manage-with-storage-explorer.md#generate-a-sas-in-storage-explorer) or [use a managed identity](#access-a-package-in-azure-blob-storage-using-a-managed-identity) to enable the App Service runtime to access the package securely.
57+
You can also run a package from an external URL, such as Azure Blob Storage. You can use the [Azure Storage Explorer](../vs-azure-tools-storage-manage-with-storage-explorer.md) to upload package files to your Blob storage account. You should use a private storage container with a [Shared Access Signature (SAS)](../vs-azure-tools-storage-manage-with-storage-explorer.md#generate-a-sas-in-storage-explorer) or [use a managed identity](#access-a-package-in-azure-blob-storage-using-a-managed-identity) to enable the App Service runtime to access the package securely.
58+
59+
> [!NOTE]
60+
> Currently, an existing App Service resource that runs a local package cannot be migrated to run from a remote package. You will have to create a new App Service resource configured to run from an external URL.
5861
5962
Once you upload your file to Blob storage and have an SAS URL for the file, set the `WEBSITE_RUN_FROM_PACKAGE` app setting to the URL. The following example does it by using Azure CLI:
6063

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-visual-studio-code-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ In this Dockerfile, the parent image is one of the built-in Java containers of A
119119

120120
2. [Open the Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette), and type **Docker Images: Build Image**. Type **Enter** to run the command.
121121

122-
3. In the image tag box, specify the tag you want in the following format: `<acr-name>.azurecr.io/<image-name>/<tag>`, where `<acr-name>` is the name of the container registry you created. Press **Enter**.
122+
3. In the image tag box, specify the tag you want in the following format: `<acr-name>.azurecr.io/<image-name>:<tag>`, where `<acr-name>` is the name of the container registry you created. Press **Enter**.
123123

124124
4. When the image finishes building, click **Refresh** at the top of the **IMAGES** explorer and verify that the image is built successfully.
125125

articles/azure-arc/data/includes/azure-arc-data-preview-release.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ ms.custom:
77
ms.topic: include
88
ms.date: 06/11/2024
99
---
10-
At this time, a test or preview build is not available for the next release.
1110

1211
<!---
13-
July, 2024 preview release is now available.
12+
At this time, a test or preview build is not available for the next release.
13+
-->
14+
15+
Sept, 2024 preview release is now available.
1416

1517
|Component|Value|
1618
|-----------|-----------|
1719
|Container images registry/repository |`mcr.microsoft.com/arcdata/preview`|
18-
|Container images tag |`v1.31.0_2024-07-09`|
20+
|Container images tag |`v1.33.0_2024-09-10`|
1921
|**CRD names and version:**| |
2022
|`activedirectoryconnectors.arcdata.microsoft.com`| v1beta1, v1beta2, v1, v2|
2123
|`datacontrollers.arcdata.microsoft.com`| v1beta1, v1 through v5|
@@ -32,11 +34,12 @@ July, 2024 preview release is now available.
3234
|`telemetrycollectors.arcdata.microsoft.com`| v1beta1 through v1beta5|
3335
|`telemetryrouters.arcdata.microsoft.com`| v1beta1 through v1beta5|
3436
|Azure Resource Manager (ARM) API version|2023-11-01-preview|
35-
|`arcdata` Azure CLI extension version|1.5.16 ([Download](https://aka.ms/az-cli-arcdata-ext))|
36-
|Arc-enabled Kubernetes helm chart extension version|1.31.0|
37+
|`arcdata` Azure CLI extension version|1.5.18 ([Download](https://aka.ms/az-cli-arcdata-ext))|
38+
|Arc-enabled Kubernetes helm chart extension version|1.33.0|
3739
|Azure Arc Extension for Azure Data Studio<br/>`arc`<br/>`azcli`|<br/>1.8.0 ([Download](https://aka.ms/ads-arcdata-ext))</br>1.8.0 ([Download](https://aka.ms/ads-azcli-ext))|
38-
|SQL Database version | 970 |
40+
|SQL Database version | 972 |
3941

40-
Release Notes:
41-
- Arc SQL Server | Automatically start billing for ESU on servers that are enabled for ESU and host SQL Server 2014 instances when SQL Server 2014 ESU program starts
42-
-->
42+
Pre-release Notes:
43+
- Arc SQL Server | Allow the AG inventory feature for all license types | GA
44+
- Always On availability groups inventory feature is available for all license type
45+
- Arc SQL Server | Allow applying physical core license to physical machines | GA

articles/azure-arc/servers/manage-vm-extensions.md

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: VM extension management with Azure Arc-enabled servers
33
description: Azure Arc-enabled servers can manage deployment of virtual machine extensions that provide post-deployment configuration and automation tasks with non-Azure VMs.
4-
ms.date: 05/17/2024
4+
ms.date: 09/04/2024
55
ms.topic: conceptual
66
---
77

@@ -29,9 +29,9 @@ Azure Arc-enabled servers enables you to deploy, remove, and update Azure VM ext
2929

3030
Azure Arc-enabled servers VM extension support provides the following key benefits:
3131

32-
- Collect log data for analysis with [Logs in Azure Monitor](../../azure-monitor/logs/data-platform-logs.md) by enabling the Log Analytics agent VM extension. Log Analytics makes it useful for doing complex analysis across log data from different kinds of sources.
32+
- Collect log data for analysis with [Logs in Azure Monitor](../../azure-monitor/logs/data-platform-logs.md) by enabling the Azure Monitor agent VM extension. Log data analysis makes it useful for doing complex analysis across log data from different kinds of sources.
3333

34-
- With [VM insights](../../azure-monitor/vm/vminsights-overview.md), it analyzes the performance of your Windows and Linux VMs, and monitors their processes and dependencies on other resources and external processes. This is achieved through enabling both the Log Analytics agent and Dependency agent VM extensions.
34+
- With [VM insights](../../azure-monitor/vm/vminsights-overview.md), it analyzes the performance of your Windows and Linux VMs, and monitors their processes and dependencies on other resources and external processes. This is achieved through enabling both the Azure Monitor agent and Dependency agent VM extensions.
3535

3636
- Download and execute scripts on hybrid connected machines using the Custom Script Extension. This extension is useful for post deployment configuration, software installation, or any other configuration or management tasks.
3737

@@ -61,7 +61,6 @@ Arc-enabled servers support moving machines with one or more VM extensions insta
6161
|Microsoft Defender for Cloud integrated vulnerability scanner |Qualys |WindowsAgent.AzureSecurityCenter |[Microsoft Defender for Cloud’s integrated vulnerability assessment solution for Azure and hybrid machines](../../security-center/deploy-vulnerability-assessment-vm.md)|
6262
|Microsoft Antimalware extension |Microsoft.Azure.Security |IaaSAntimalware |[Microsoft Antimalware extension for Windows](/azure/virtual-machines/extensions/iaas-antimalware-windows) |
6363
|Custom Script extension |Microsoft.Compute | CustomScriptExtension |[Windows Custom Script Extension](/azure/virtual-machines/extensions/custom-script-windows)|
64-
|Log Analytics agent |Microsoft.EnterpriseCloud.Monitoring |MicrosoftMonitoringAgent |[Log Analytics VM extension for Windows](/azure/virtual-machines/extensions/oms-windows)|
6564
|Azure Monitor for VMs (insights) |Microsoft.Azure.Monitoring.DependencyAgent |DependencyAgentWindows | [Dependency agent virtual machine extension for Windows](/azure/virtual-machines/extensions/agent-dependency-windows)|
6665
|Azure Key Vault Certificate Sync | Microsoft.Azure.Key.Vault |KeyVaultForWindows | [Key Vault virtual machine extension for Windows](/azure/virtual-machines/extensions/key-vault-windows) |
6766
|Azure Monitor Agent |Microsoft.Azure.Monitor |AzureMonitorWindowsAgent |[Install the Azure Monitor agent](../../azure-monitor/agents/azure-monitor-agent-manage.md) |
@@ -77,7 +76,6 @@ Arc-enabled servers support moving machines with one or more VM extensions insta
7776
|----------|----------|-----|-----------------------|
7877
|Microsoft Defender for Cloud integrated vulnerability scanner |Qualys |LinuxAgent.AzureSecurityCenter |[Microsoft Defender for Cloud’s integrated vulnerability assessment solution for Azure and hybrid machines](../../security-center/deploy-vulnerability-assessment-vm.md)|
7978
|Custom Script extension |Microsoft.Azure.Extensions |CustomScript |[Linux Custom Script Extension Version 2](/azure/virtual-machines/extensions/custom-script-linux) |
80-
|Log Analytics agent |Microsoft.EnterpriseCloud.Monitoring |OmsAgentForLinux |[Log Analytics VM extension for Linux](/azure/virtual-machines/extensions/oms-linux) |
8179
|Azure Monitor for VMs (insights) |Microsoft.Azure.Monitoring.DependencyAgent |DependencyAgentLinux |[Dependency agent virtual machine extension for Linux](/azure/virtual-machines/extensions/agent-dependency-linux) |
8280
|Azure Key Vault Certificate Sync | Microsoft.Azure.Key.Vault |KeyVaultForLinux | [Key Vault virtual machine extension for Linux](/azure/virtual-machines/extensions/key-vault-linux) |
8381
|Azure Monitor Agent |Microsoft.Azure.Monitor |AzureMonitorLinuxAgent |[Install the Azure Monitor agent](../../azure-monitor/agents/azure-monitor-agent-manage.md) |
@@ -106,11 +104,9 @@ To deploy an extension to Arc-enabled servers, a user requires the following per
106104

107105
The role **Azure Connected Machine Resource Administrator** includes the permissions required to deploy extensions, however it also includes permission to delete Arc-enabled server resources.
108106

109-
### Log Analytics VM extension
107+
### Azure Monitor agent VM extension
110108

111-
The Log Analytics agent VM extension for Linux requires Python 2.x is installed on the target machine.
112-
113-
Before you install the extension we suggest you review the [deployment options for the Log Analytics agent](concept-log-analytics-extension-deployment.md) to understand the different methods available and which meets your requirements.
109+
Before you install the extension we suggest you review the [deployment options for the Azure Monitor agent](concept-log-analytics-extension-deployment.md) to understand the different methods available and which meets your requirements.
114110

115111
### Azure Key Vault VM extension
116112

@@ -146,52 +142,52 @@ The following extensions are available for Windows and Linux machines:
146142

147143
### Windows extension availability
148144

149-
|Operating system |Azure Monitor agent |Log Analytics agent |Dependency VM Insights |Qualys |Custom Script |Key Vault |Hybrid Runbook |Antimalware Extension |Windows Admin Center |
150-
|-----------------|--------------------|--------------------|-----------------------|-------|--------------|----------|---------------|----------------------|---------------------|
151-
|Windows Server 2022 |X |X |X |X |X | |X | |X |
152-
|Windows Server 2019 |X |X |X |X |X |X | | |X |
153-
|Windows Server 2016 |X |X |X |X |X |X |X |Built-in |X |
154-
|Windows Server 2012 R2 |X |X |X |X |X | |X |X | |
155-
|Windows Server 2012 |X |X |X |X |X |X |X |X | |
156-
|Windows Server 2008 R2 SP1 |X |X |X |X |X | |X |X | |
157-
|Windows Server 2008 R2 | | | |X |X | |X |X | |
158-
|Windows Server 2008 SP2 | |X | |X |X | |X | | |
159-
|Windows 11 client OS |X | | |X | | | | | |
160-
|Windows 10 1803 (RS4) and higher |X | | |X |X | | | | |
161-
|Windows 10 Enterprise (including multi-session) and Pro (Server scenarios only) |X |X |X |X |X | |X | | |
162-
|Windows 8 Enterprise and Pro (Server scenarios only) | |X |X |X | | |X | | |
163-
|Windows 7 SP1 (Server scenarios only) | |X |X |X | | |X | | |
164-
|Azure Stack HCI (Server scenarios only) | |X | |X | | |X | | |
145+
|Operating system |Azure Monitor agent |Dependency VM Insights |Qualys |Custom Script |Key Vault |Hybrid Runbook |Antimalware Extension |Windows Admin Center |
146+
|-----------------|--------------------|-----------------------|-------|--------------|----------|---------------|----------------------|---------------------|
147+
|Windows Server 2022 |X |X |X |X | |X | |X |
148+
|Windows Server 2019 |X |X |X |X |X | | |X |
149+
|Windows Server 2016 |X |X |X |X |X |X |Built-in |X |
150+
|Windows Server 2012 R2 |X |X |X |X | |X |X | |
151+
|Windows Server 2012 |X |X |X |X |X |X |X | |
152+
|Windows Server 2008 R2 SP1 |X |X |X |X | |X |X | |
153+
|Windows Server 2008 R2 | | |X |X | |X |X | |
154+
|Windows Server 2008 SP2 | | |X |X | |X | | |
155+
|Windows 11 client OS |X | |X | | | | | |
156+
|Windows 10 1803 (RS4) and higher |X | |X |X | | | | |
157+
|Windows 10 Enterprise (including multi-session) and Pro (Server scenarios only) |X |X |X |X | |X | | |
158+
|Windows 8 Enterprise and Pro (Server scenarios only) | |X |X | | |X | | |
159+
|Windows 7 SP1 (Server scenarios only) | |X |X | | |X | | |
160+
|Azure Stack HCI (Server scenarios only) | | |X | | |X | | |
165161

166162
### Linux extension availability
167163

168-
|Operating system |Azure Monitor agent |Log Analytics agent |Dependency VM Insights |Qualys |Custom Script |Key Vault |Hybrid Runbook |Antimalware Extension |Connected Machine agent |
169-
|-----------------|--------------------|--------------------|-----------------------|-------|--------------|----------|---------------|----------------------|------------------------|
170-
|Amazon Linux 2 | |X | |X | | |X |X |
171-
|CentOS Linux 8 |X |X |X |X |X | |X |X |
172-
|CentOS Linux 7 |X |X |X |X |X | |X |X |
173-
|CentOS Linux 6 | |X | |X |X | |X | |
174-
|Debian 10 |X | | |X |X | |X | |
175-
|Debian 9 |X |X |X |X |X | | | |
176-
|Debian 8 | |X |X |X | | |X | |
177-
|Debian 7 | | | |X | | |X | |
178-
|OpenSUSE 13.1+ | | | |X |X | | | |
179-
|Oracle Linux 8 |X |X | |X |X | |X |X |
180-
|Oracle Linux 7 |X |X | |X |X | |X |X |
181-
|Oracle Linux 6 | |X | |X |X | |X |X |
182-
|Red Hat Enterprise Linux Server 8 |X |X | |X |X | |X |X |
183-
|Red Hat Enterprise Linux Server 7 |X |X |X |X |X | |X |X |
184-
|Red Hat Enterprise Linux Server 6 | |X |X |X | | |X | |
185-
|SUSE Linux Enterprise Server 15.2 |X | | |X |X |X | |X |
186-
|SUSE Linux Enterprise Server 15.1 |X |X | |X |X |X |X |X |
187-
|SUSE Linux Enterprise Server 15 SP1 |X |X |X |X |X |X |X |X |
188-
|SUSE Linux Enterprise Server 15 |X |X |X |X |X |X |X |X |
189-
|SUSE Linux Enterprise Server 15 SP5 |X |X |X |X |X | |X |X |
164+
|Operating system |Azure Monitor agent |Dependency VM Insights |Qualys |Custom Script |Key Vault |Hybrid Runbook |Antimalware Extension |Connected Machine agent |
165+
|-----------------|--------------------|-----------------------|-------|--------------|----------|---------------|----------------------|------------------------|
166+
|Amazon Linux 2 | | |X | | |X |X |
167+
|CentOS Linux 8 |X |X |X |X | |X |X |
168+
|CentOS Linux 7 |X |X |X |X | |X |X |
169+
|CentOS Linux 6 | | |X |X | |X | |
170+
|Debian 10 |X | |X |X | |X | |
171+
|Debian 9 |X |X |X |X | | | |
172+
|Debian 8 | |X |X | | |X | |
173+
|Debian 7 | | |X | | |X | |
174+
|OpenSUSE 13.1+ | | |X |X | | | |
175+
|Oracle Linux 8 |X | |X |X | |X |X |
176+
|Oracle Linux 7 |X | |X |X | |X |X |
177+
|Oracle Linux 6 | | |X |X | |X |X |
178+
|Red Hat Enterprise Linux Server 8 |X | |X |X | |X |X |
179+
|Red Hat Enterprise Linux Server 7 |X |X |X |X | |X |X |
180+
|Red Hat Enterprise Linux Server 6 | |X |X | | |X | |
181+
|SUSE Linux Enterprise Server 15.2 |X | |X |X |X | |X |
182+
|SUSE Linux Enterprise Server 15.1 |X | |X |X |X |X |X |
183+
|SUSE Linux Enterprise Server 15 SP1 |X |X |X |X |X |X |X |
184+
|SUSE Linux Enterprise Server 15 |X |X |X |X |X |X |X |
185+
|SUSE Linux Enterprise Server 15 SP5 |X |X |X |X | |X |X |
190186
|SUSE Linux Enterprise Server 12 SP5 |X |X |X |X |X | |X |X |
191-
|Ubuntu 20.04 LTS |X |X |X |X |X | |X |X |
192-
|Ubuntu 18.04 LTS |X |X |X |X |X |X |X |X |
193-
|Ubuntu 16.04 LTS |X |X |X |X | | |X |X |
194-
|Ubuntu 14.04 LTS | |X | |X | | |X | |
187+
|Ubuntu 20.04 LTS |X |X |X |X | |X |X |
188+
|Ubuntu 18.04 LTS |X |X |X |X |X |X |X |
189+
|Ubuntu 16.04 LTS |X |X |X | | |X |X |
190+
|Ubuntu 14.04 LTS | | |X | | |X | |
195191

196192
For the regional availabilities of different Azure services and VM extensions available for Azure Arc-enabled servers, [refer to Azure Global's Product Availability Roadmap](https://global.azure.com/product-availability/roadmap).
197193

0 commit comments

Comments
 (0)