Skip to content

Commit 164a431

Browse files
authored
Merge pull request #262003 from MicrosoftDocs/main
11/28 11:00 AM IST Publish
2 parents c5de079 + 3aaba3c commit 164a431

25 files changed

+320
-322
lines changed

articles/aks/quickstart-helm.md

Lines changed: 184 additions & 169 deletions
Large diffs are not rendered by default.

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ The following table shows the supported log types and descriptions:
199199
200200
| Log Name| Log type | Windows | Windows Container | Linux | Linux Container | Description |
201201
|-|-|-|-|-|-|-|
202-
| App Service Console Logs | AppServiceConsoleLogs | Java SE & Tomcat | Yes | Yes | Yes | Standard output and standard error |
202+
| App Service Console Logs | AppServiceConsoleLogs | Java SE & Tomcat | Yes | Yes | Yes | Standard output and standard error <sup>3</sup> |
203203
| HTTP logs | AppServiceHTTPLogs | Yes | Yes | Yes | Yes | Web server logs |
204204
| App Service Environment Platform Logs | AppServiceEnvironmentPlatformLogs | Yes | N/A | Yes | Yes | App Service Environment: scaling, configuration changes, and status logs|
205205
| Access Audit Logs | AppServiceAuditLogs | Yes | Yes | Yes | Yes | Login activity via FTP and Kudu |
206206
| Site Content Change Audit Logs | AppServiceFileAuditLogs | Yes | Yes | TBA | TBA | File changes made to the site content; **only available for Premium tier and above** |
207-
| App Service Application Logs | AppServiceAppLogs | ASP.NET, .NET Core, & Tomcat <sup>1</sup> | ASP.NET & Tomcat <sup>1</sup> | .NET Core, Java, SE & Tomcat Blessed Images <sup>2</sup> | Java SE & Tomcat Blessed Images <sup>2</sup> | Application logs |
207+
| App Service Application Logs | AppServiceAppLogs | ASP.NET, .NET Core, & Tomcat <sup>1</sup> | ASP.NET & Tomcat <sup>1</sup> | .NET Core, Java, SE & Tomcat Blessed Images <sup>2</sup> | Java SE & Tomcat Blessed Images <sup>2</sup> | Application logs <sup>3</sup> |
208208
| IPSecurity Audit logs | AppServiceIPSecAuditLogs | Yes | Yes | Yes | Yes | Requests from IP Rules |
209209
| App Service Platform logs | AppServicePlatformLogs | TBA | Yes | Yes | Yes | Container operation logs |
210210
| Report Antivirus Audit Logs | AppServiceAntivirusScanAuditLogs <sup>3</sup> | Yes | Yes | Yes | Yes | [Anti-virus scan logs](https://azure.github.io/AppService/2020/12/09/AzMon-AppServiceAntivirusScanAuditLogs.html) using Microsoft Defender for Cloud; **only available for Premium tier** |
@@ -213,7 +213,9 @@ The following table shows the supported log types and descriptions:
213213
214214
<sup>2</sup> For Java SE apps, add `WEBSITE_AZMON_PREVIEW_ENABLED` to the app settings and set it to `true` or to `1`.
215215
216-
<sup>3</sup> AppServiceAntivirusScanAuditLogs log type is still currently in Preview
216+
<sup>3</sup> Current logging limit is set to 100 logs per minute.
217+
218+
<sup>4</sup> AppServiceAntivirusScanAuditLogs log type is still currently in Preview
217219
218220
## Networking considerations
219221

articles/azure-monitor/logs/log-excel.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@ You can integrate Azure Monitor Log Analytics and Microsoft Excel using M query
1616
> [!NOTE]
1717
> Because Excel is a local client application, local hardware and software limitations impact it's performance and ability to process large sets of data.
1818
19+
## Prerequisites
20+
21+
To integrate Log Analytics and Excel, you need:
22+
23+
- [Excel](https://www.microsoft.com/en-us/microsoft-365/excel) local client application.
24+
- A Log Analytics workspace that has some data. If needed, [create a diagnostic setting to send data to a Log Analytics workspace](../essentials/create-diagnostic-settings.md).
25+
26+
[!INCLUDE [log-analytics-query-permissions](../../../includes/log-analytics-query-permissions.md)]
27+
1928
## Create your M query in Log Analytics
2029

2130
1. **Create and run your query** in Log analytics as you normally would. Don’t worry if you hit the number of records limitation in the user interface. We recommend you use relative dates - like the ‘ago’ function or the UI time picker - so Excel refreshes the right set of data.
2231

2332
2. **Export Query** - Once you are happy with the query and its results, export the query to M using Log Analytics **Export to Power BI (M query)** menu choice under the *Export* menu:
2433

25-
:::image type="content" source="media/log-excel/export-query.png" alt-text="Log Analytics query with the data and export option" border="true":::
34+
:::image type="content" source="media/log-excel/export-query.png" alt-text="Screenshot of Log Analytics query with the data and export option." border="true":::
2635

2736

2837

articles/azure-monitor/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,8 @@ items:
12121212
href: logs/functions.md
12131213
- name: Parse text data
12141214
href: logs/parse-text.md
1215+
- name: Send to Excel
1216+
href: logs/log-excel.md
12151217
- name: Computer groups
12161218
href: logs/computer-groups.md
12171219
- name: Cross-service and cross-resource queries

articles/hdinsight-aks/flink/flink-create-cluster-portal.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create an Apache Flink® cluster in HDInsight on AKS using Azure portal
33
description: Creating an Apache Flink cluster in HDInsight on AKS with Azure portal.
44
ms.service: hdinsight-aks
55
ms.topic: how-to
6-
ms.date: 10/27/2023
6+
ms.date: 12/28/2023
77
---
88

99
# Create an Apache Flink® cluster in HDInsight on AKS with Azure portal
@@ -15,6 +15,7 @@ Complete the following steps to create an Apache Flink cluster on Azure portal.
1515
## Prerequisites
1616

1717
Complete the prerequisites in the following sections:
18+
* [Subscription prerequisites](../prerequisites-subscription.md)
1819
* [Resource prerequisites](../prerequisites-resources.md)
1920
* [Create a cluster pool](../quickstart-create-cluster.md#create-a-cluster-pool)
2021

articles/hdinsight-aks/spark/create-spark-cluster.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ title: How to create Spark cluster in HDInsight on AKS
33
description: Learn how to create Spark cluster in HDInsight on AKS
44
ms.service: hdinsight-aks
55
ms.topic: how-to
6-
ms.date: 10/30/2023
6+
ms.date: 12/28/2023
77
---
88

99
# Create Spark cluster in HDInsight on AKS (Preview)
1010

1111
[!INCLUDE [feature-in-preview](../includes/feature-in-preview.md)]
1212

13-
Once the[prerequisite](../prerequisites-resources.md) steps are complete, and you have a cluster pool deployed, continue to use the Azure portal to create a Spark cluster.
14-
You can use the Azure portal to create an Apache Spark cluster in cluster pool. You then create a Jupyter Notebook and use it to run Spark SQL queries against Apache Hive tables.
13+
Once the [subscription prerequisites](../prerequisites-subscription.md) and [resource prerequisites](../prerequisites-resources.md) steps are complete, and you have a cluster pool deployed, continue to use the Azure portal to create a Spark cluster.
14+
You can use the Azure portal to create an Apache Spark cluster in cluster pool. You can then create a Jupyter Notebook and use it to run Spark SQL queries against Apache Hive tables.
1515

1616
1. In the Azure portal, type cluster pools, and select cluster pools to go to the cluster pools page. On the cluster pools page, select the cluster pool in which you can add a new Spark cluster.
1717
1. On the specific cluster pool page, click **+ New cluster**.

articles/hdinsight-aks/trino/trino-create-cluster.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create a Trino cluster - Azure portal
33
description: Creating a Trino cluster in HDInsight on AKS on the Azure portal.
44
ms.service: hdinsight-aks
55
ms.topic: how-to
6-
ms.date: 10/19/2023
6+
ms.date: 12/28/2023
77
---
88

99
# Create a Trino cluster in the Azure portal (Preview)
@@ -14,6 +14,9 @@ This article describes the steps to create a Trino cluster with HDInsight on AKS
1414

1515
## Prerequisites
1616

17+
Complete the prerequisites in the following sections:
18+
19+
* [Subscription prerequisites](../prerequisites-subscription.md)
1720
* [Resource prerequisites](../prerequisites-resources.md)
1821
* [Create a cluster pool](../quickstart-create-cluster.md#create-a-cluster-pool)
1922

articles/machine-learning/how-to-network-isolation-model-catalog.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ ms.date: 12/15/2023
1414

1515
# Use Model Catalog collections with workspace managed virtual network
1616

17-
In this article, you learn how you can use the various collections in the Model Catalog within an isolated network.
17+
In this article, you learn how to use the various collections in the Model Catalog within an isolated network.
1818

19-
Workspace [managed virtual network](./how-to-network-isolation-planning.md) is the recommended way to support network isolation with the Model Catalog. It provides easily configuration to secure your workspace. After you enable managed virtual network in the workspace level, resources related to workspace in the same virtual network, will use the same network setting in the workspace level. You can also configure the workspace to use private endpoint to access other Azure resources such as Azure OpenAI. Furthermore, you can configure FQDN rule to approve outbound to non-Azure resources, whose relevance you learn in the rest of this article. See [how to Workspace managed network isolation](./how-to-managed-network.md) to enable workspace managed virtual network.
19+
Workspace [managed virtual network](./how-to-network-isolation-planning.md) is the recommended way to support network isolation with the Model Catalog. It provides easily configuration to secure your workspace. After you enable managed virtual network in the workspace level, resources related to workspace in the same virtual network, will use the same network setting in the workspace level. You can also configure the workspace to use private endpoint to access other Azure resources such as Azure OpenAI. Furthermore, you can configure FQDN rule to approve outbound to non-Azure resources, which is required to use some of the collections in the Model Catalog. See [how to Workspace managed network isolation](./how-to-managed-network.md) to enable workspace managed virtual network.
2020

2121
The creation of the managed virtual network is deferred until a compute resource is created or provisioning is manually started. You can use following command to manually trigger network provisioning.
2222
```bash
@@ -36,21 +36,25 @@ az ml workspace provision-network --subscription <sub_id> -g <resource_group_nam
3636
* [ExpressRoute](https://azure.microsoft.com/products/expressroute/) - Connects on-premises networks into the cloud over a private connection. Connection is made using a connectivity provider.
3737

3838
* [Azure Bastion](/azure/bastion/bastion-overview) - In this scenario, you create an Azure Virtual Machine (sometimes called a jump box) inside the virtual network. You then connect to the VM using Azure Bastion. Bastion allows you to connect to the VM using either an RDP or SSH session from your local web browser. You then use the jump box as your development environment. Since it is inside the virtual network, it can directly access the workspace.
39-
3. Since the workspace managed virtual network can access internet in this configuration, you can work with all the Collections in the Model Catalog from within the workspace.
4039

41-
## Workspace managed virtual network to allow only approved outbound
40+
Since the workspace managed virtual network can access internet in this configuration, you can work with all the Collections in the Model Catalog from within the workspace.
4241

43-
1. Configure a workspace with managed virtual network to allow only approved outbound by following the steps listed [here](./how-to-managed-network.md#configure-a-managed-virtual-network-to-allow-only-approved-outbound).
44-
2. If you choose to set the public network access to the workspace to disabled, you can connect to the workspace using one of the methods as listed in Scenario 1.
42+
## Workspace managed virtual network to allow only approved outbound
4543

44+
1. Configure a workspace by following [Workspace managed network isolation](./how-to-managed-network.md#configure-a-managed-virtual-network-to-allow-only-approved-outbound). In step 3 of the tutorial when selecting **Workspace managed outbound access**, select **Allow Only Approved Outbound**.
45+
2. If you set the public network access to the workspace to disabled, you can connect to the workspace using one of the methods as listed [in step 2 of the allow internet outbound section of this tutorial](#workspace-managed-virtual-network-to-allow-internet-outbound).
46+
3. The workspace manages virtual network is set to an allow only configuration. You must add a corresponding user-defined outbound rule to allow all the relevant FQDNs.
47+
1. Follow this link for a list of FQDNs required for the [Curated by Azure AI collection](#language-models-in-curated-by-azure-ai-collection).
48+
2. Follow this link for a list of FQDNs required for the [Hugging Face collection](#work-with-hugging-face-collection).
4649

4750
## Work with open source models curated by Azure Machine Learning
4851

49-
Workspace managed virtual network to allow only approved outbound uses a Service Endpoint Policy to Azure Machine Learning managed storage accounts, to help access the models in the collections curated by Azure Machine Learning in an out-of-the-box manner. This mode of workspace configuration also has default outbound to Microsoft Container Registry where the docker image used to deploy the models is present.
52+
Workspace managed virtual network to allow only approved outbound uses a Service Endpoint Policy to Azure Machine Learning managed storage accounts, to help access the models in the collections curated by Azure Machine Learning in an out-of-the-box manner. This mode of workspace configuration also has default outbound to the Microsoft Container Registry that contains the docker image used to deploy the models.
5053

5154
### Language models in 'Curated by Azure AI' collection
5255

53-
Today, these models involve dynamic installation of dependencies at runtime. Therefore, users should add user defined outbound rules for the following FQDNs at the workspace level:
56+
These models involve dynamic installation of dependencies at runtime. To add a user defined outbound rule, follow step four of
57+
To use the Curated by Azure AI collection, users should add user defined outbound rules for the following FQDNs at the workspace level:
5458

5559
* `*.anaconda.org`
5660
* `*.anaconda.com`
@@ -60,6 +64,8 @@ Today, these models involve dynamic installation of dependencies at runtime. The
6064
* `*.pytorch.org`
6165
* `pytorch.org`
6266

67+
Follow Step 4 in the [managed virtual network tutorial](./how-to-managed-network.md#configure-a-managed-virtual-network-to-allow-only-approved-outbound) to add the corresponding user-defined outbound rules.
68+
6369
> [!WARNING]
6470
> FQDN outbound rules are implemented using Azure Firewall. If you use outbound FQDN rules, charges for Azure Firewall are included in your billing. For more information, see [Pricing](./how-to-managed-network.md#pricing).
6571
@@ -81,6 +87,8 @@ Users need to add the following outbound FQDNs rules for Hugging Face Hub, Docke
8187
* `cdn-lfs.huggingface.co`
8288
* `cdn.auth0.com`
8389

90+
Follow Step 4 in the [managed virtual network tutorial](./how-to-managed-network.md#configure-a-managed-virtual-network-to-allow-only-approved-outbound) to add the corresponding user-defined outbound rules.
91+
8492
## Next steps
8593

8694
* Learn how-to [troubleshoot managed virtual network](./how-to-troubleshoot-managed-network.md)

0 commit comments

Comments
 (0)