Skip to content

Commit 4732c90

Browse files
authored
Merge pull request #257310 from MicrosoftDocs/main
11/3 11:00 AM IST Publishing
2 parents c04cc71 + 99fc0db commit 4732c90

File tree

58 files changed

+613
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+613
-237
lines changed

articles/ai-services/openai/how-to/embeddings.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ services: cognitive-services
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: how-to
9-
ms.date: 9/12/2023
10-
author: ChrisHMSFT
11-
ms.author: chrhoder
9+
ms.date: 11/02/2023
10+
author: mrbullwinkle
11+
ms.author: mbullwin
1212
recommendations: false
1313
keywords:
1414

@@ -75,15 +75,7 @@ foreach (float item in returnValue.Value.Data[0].Embedding)
7575

7676
### Verify inputs don't exceed the maximum length
7777

78-
The maximum length of input text for our embedding models is 2048 tokens (equivalent to around 2-3 pages of text). You should verify that your inputs don't exceed this limit before making a request.
79-
80-
### Choose the best model for your task
81-
82-
For the search models, you can obtain embeddings in two ways. The `<search_model>-doc` model is used for longer pieces of text (to be searched over) and the `<search_model>-query` model is used for shorter pieces of text, typically queries or class labels in zero shot classification. You can read more about all of the Embeddings models in our [Models](../concepts/models.md) guide.
83-
84-
### Replace newlines with a single space
85-
86-
Unless you're embedding code, we suggest replacing newlines (\n) in your input with a single space, as we have observed inferior results when newlines are present.
78+
The maximum length of input text for our latest embedding models is 8192 tokens. You should verify that your inputs don't exceed this limit before making a request.
8779

8880
## Limitations & risks
8981

articles/azure-monitor/essentials/activity-log.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@ Activity log events are retained in Azure for *90 days* and then deleted. There'
3333
## View the activity log
3434

3535
You can access the activity log from most menus in the Azure portal. The menu that you open it from determines its initial filter. If you open it from the **Monitor** menu, the only filter is on the subscription. If you open it from a resource's menu, the filter is set to that resource. You can always change the filter to view all other entries. Select **Add Filter** to add more properties to the filter.
36-
37-
![Screenshot that shows the activity log.](./media/activity-log/view-activity-log.png)
36+
<!-- convertborder later -->
37+
:::image type="content" source="./media/activity-log/view-activity-log.png" lightbox="./media/activity-log/view-activity-log.png" alt-text="Screenshot that shows the activity log." border="false":::
3838

3939
For a description of activity log categories, see [Azure activity log event schema](activity-log-schema.md#categories).
4040

4141
## Download the activity log
4242

4343
Select **Download as CSV** to download the events in the current view.
44-
45-
![Screenshot that shows downloading the activity log.](media/activity-log/download-activity-log.png)
44+
<!-- convertborder later -->
45+
:::image type="content" source="media/activity-log/download-activity-log.png" lightbox="media/activity-log/download-activity-log.png" alt-text="Screenshot that shows downloading the activity log." border="false":::
4646

4747
### View change history
4848

4949
For some events, you can view the change history, which shows what changes happened during that event time. Select an event from the activity log you want to look at more deeply. Select the **Change history** tab to view any changes on the resource up to 30 minutes before and after the time of the operation.
5050

51-
![Screenshot that shows the Change history list for an event.](media/activity-log/change-history-event.png)
51+
:::image type="content" source="media/activity-log/change-history-event.png" lightbox="media/activity-log/change-history-event.png" alt-text="Screenshot that shows the Change history list for an event.":::
5252

5353
If any changes are associated with the event, you'll see a list of changes that you can select. Selecting a change opens the **Change history** page. This page displays the changes to the resource. In the following example, you can see that the VM changed sizes. The page displays the VM size before the change and after the change. To learn more about change history, see [Get resource changes](../../governance/resource-graph/how-to/get-resource-changes.md).
5454

55-
![Screenshot that shows the Change history page showing differences.](media/activity-log/change-history-event-details.png)
55+
:::image type="content" source="media/activity-log/change-history-event-details.png" lightbox="media/activity-log/change-history-event-details.png" alt-text="Screenshot that shows the Change history page showing differences.":::
5656

5757
### Other methods to retrieve activity log events
5858

@@ -76,7 +76,7 @@ You can also access activity log events by using the following methods:
7676

7777
Select **Export Activity Logs** to send the activity log to a Log Analytics workspace.
7878

79-
![Screenshot that shows exporting activity logs.](media/activity-log/diagnostic-settings-export.png)
79+
:::image type="content" source="media/activity-log/diagnostic-settings-export.png" lightbox="media/activity-log/diagnostic-settings-export.png" alt-text="Screenshot that shows exporting activity logs.":::
8080

8181
You can send the activity log from any single subscription to up to five workspaces.
8282

articles/azure-monitor/essentials/collect-custom-metrics-guestos-resource-manager-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ To deploy the ARM template, we use Azure PowerShell.
263263

264264
1. On the **Monitor** page, select **Metrics**.
265265

266-
![Screenshot that shows the Metrics page.](media/collect-custom-metrics-guestos-resource-manager-vm/metrics.png)
266+
:::image type="content" source="media/collect-custom-metrics-guestos-resource-manager-vm/metrics.png" lightbox="media/collect-custom-metrics-guestos-resource-manager-vm/metrics.png" alt-text="Screenshot that shows the Metrics page.":::
267267

268268
1. Change the aggregation period to **Last 30 minutes**.
269269

articles/azure-monitor/essentials/collect-custom-metrics-guestos-vm-classic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ The process that's outlined in this article only works on classic virtual machin
3232
## Create a classic virtual machine and storage account
3333

3434
1. Create a classic VM by using the Azure portal.
35-
![Create Classic VM](./media/collect-custom-metrics-guestos-vm-classic/create-classic-vm.png)
35+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-classic/create-classic-vm.png" lightbox="./media/collect-custom-metrics-guestos-vm-classic/create-classic-vm.png" alt-text="Create Classic VM":::
3636

3737
1. When you're creating this VM, choose the option to create a new classic storage account. We use this storage account in later steps.
3838

3939
1. In the Azure portal, go to the **Storage accounts** resource pane. Select **Keys**, and take note of the storage account name and storage account key. You need this information in later steps.
40-
![Storage access keys](./media/collect-custom-metrics-guestos-vm-classic/storage-access-keys.png)
40+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-classic/storage-access-keys.png" lightbox="./media/collect-custom-metrics-guestos-vm-classic/storage-access-keys.png" alt-text="Storage access keys":::
4141

4242
## Create a service principal
4343

@@ -185,14 +185,14 @@ Give this app “Monitoring Metrics Publisher” permissions to the resource tha
185185

186186
1. On the **Monitor** pane on the left, select **Metrics**.
187187

188-
![Navigate metrics](./media/collect-custom-metrics-guestos-vm-classic/navigate-metrics.png)
188+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-classic/navigate-metrics.png" lightbox="./media/collect-custom-metrics-guestos-vm-classic/navigate-metrics.png" alt-text="Navigate metrics":::
189189

190190
1. In the resources drop-down menu, select your classic VM.
191191

192192
1. In the namespaces drop-down menu, select **azure.vm.windows.guest**.
193193

194194
1. In the metrics drop-down menu, select **Memory\Committed Bytes in Use**.
195-
![Plot metrics](./media/collect-custom-metrics-guestos-vm-classic/plot-metrics.png)
195+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-classic/plot-metrics.png" lightbox="./media/collect-custom-metrics-guestos-vm-classic/plot-metrics.png" alt-text="Plot metrics":::
196196

197197

198198
## Next steps

articles/azure-monitor/essentials/collect-custom-metrics-guestos-vm-cloud-service-classic.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ The process that's outlined in this article works only for performance counters
3232
1. Create and deploy a classic cloud service. A sample classic Cloud Services application and deployment can be found at [Get started with Azure Cloud Services and ASP.NET](../../cloud-services/cloud-services-dotnet-get-started.md).
3333

3434
2. You can use an existing storage account or deploy a new storage account. It's best if the storage account is in the same region as the classic cloud service that you created. In the Azure portal, go to the **Storage accounts** resource pane, and then select **Keys**. Take note of the storage account name and the storage account key. You'll need this information in later steps.
35-
36-
![Storage account keys](./media/collect-custom-metrics-guestos-vm-cloud-service-classic/storage-keys.png)
35+
<!-- convertborder later -->
36+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/storage-keys.png" lightbox="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/storage-keys.png" alt-text="Storage account keys" border="false":::
3737

3838
## Create a service principal
3939

@@ -164,7 +164,7 @@ Set-AzureServiceDiagnosticsExtension -ServiceName <classicCloudServiceName> -Sto
164164

165165
1. Go to the Azure portal.
166166

167-
![Screenshot shows the Azure portal with Monitor, then Metrics selected.](./media/collect-custom-metrics-guestos-vm-cloud-service-classic/navigate-metrics.png)
167+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/navigate-metrics.png" lightbox="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/navigate-metrics.png" alt-text="Screenshot shows the Azure portal with Monitor, then Metrics selected.":::
168168

169169
2. On the left menu, select **Monitor.**
170170

@@ -177,8 +177,8 @@ Set-AzureServiceDiagnosticsExtension -ServiceName <classicCloudServiceName> -Sto
177177
6. In the metrics drop-down menu, select **Memory\Committed Bytes in Use**.
178178

179179
You use the dimension filtering and splitting capabilities to view the total memory that's used by a specific role or role instance.
180-
181-
![Screenshot shows Metrics data.](./media/collect-custom-metrics-guestos-vm-cloud-service-classic/metrics-graph.png)
180+
<!-- convertborder later -->
181+
:::image type="content" source="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/metrics-graph.png" lightbox="./media/collect-custom-metrics-guestos-vm-cloud-service-classic/metrics-graph.png" alt-text="Screenshot shows Metrics data." border="false":::
182182

183183
## Next steps
184184

articles/azure-monitor/essentials/data-collection-endpoint-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ This table describes the components of a data collection endpoint, related regio
6161
# [Azure portal](#tab/portal)
6262

6363
1. On the **Azure Monitor** menu in the Azure portal, select **Data Collection Endpoints** under the **Settings** section. Select **Create** to create a new DCR and assignment.
64-
65-
[![Screenshot that shows data collection endpoints.](media/data-collection-endpoint-overview/data-collection-endpoint-overview.png)](media/data-collection-endpoint-overview/data-collection-endpoint-overview.png#lightbox)
64+
<!-- convertborder later -->
65+
:::image type="content" source="media/data-collection-endpoint-overview/data-collection-endpoint-overview.png" lightbox="media/data-collection-endpoint-overview/data-collection-endpoint-overview.png" alt-text="Screenshot that shows data collection endpoints." border="false":::
6666

6767
1. Select **Create** to create a new endpoint. Provide a **Rule name** and specify a **Subscription**, **Resource Group**, and **Region**. This information specifies where the DCE will be created.
68-
69-
[![Screenshot that shows data collection rule basics.](media/data-collection-endpoint-overview/data-collection-endpoint-basics.png)](media/data-collection-endpoint-overview/data-collection-endpoint-basics.png#lightbox)
68+
<!-- convertborder later -->
69+
:::image type="content" source="media/data-collection-endpoint-overview/data-collection-endpoint-basics.png" lightbox="media/data-collection-endpoint-overview/data-collection-endpoint-basics.png" alt-text="Screenshot that shows data collection rule basics." border="false":::
7070

7171
1. Select **Review + create** to review the details of the DCE. Select **Create** to create it.
7272

articles/azure-monitor/essentials/data-platform-metrics.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ There are multiple types of metrics supported by Azure Monitor Metrics:
2828
- Custom metrics are collected from different sources that you configure including applications and agents running on virtual machines.
2929
- Prometheus metrics are collected from Kubernetes clusters including Azure Kubernetes service (AKS) and use industry standard tools for analyzing and alerting such as PromQL and Grafana.
3030

31-
![Diagram that shows sources and uses of metrics.](media/data-platform-metrics/metrics-overview.png)
31+
:::image type="content" source="media/data-platform-metrics/metrics-overview.png" lightbox="media/data-platform-metrics/metrics-overview.png" alt-text="Diagram that shows sources and uses of metrics.":::
3232

3333
The differences between each of the metrics are summarized in the following table.
3434

@@ -62,7 +62,7 @@ For a complete list of data sources that can send data to Azure Monitor Metrics,
6262
Azure Monitor provides REST APIs that allow you to get data in and out of Azure Monitor Metrics.
6363
- **Custom metrics API** - [Custom metrics](./metrics-custom-overview.md) allow you to load your own metrics into the Azure Monitor Metrics database. Those metrics can then be used by the same analysis tools that process Azure Monitor platform metrics.
6464
- **Azure Monitor Metrics REST API** - Allows you to access Azure Monitor platform metrics definitions and values. For more information, see [Azure Monitor REST API](/rest/api/monitor/). For information on how to use the API, see the [Azure monitoring REST API walkthrough](./rest-api-walkthrough.md).
65-
- **Azure Monitor Metrics Data plane REST API** - [Azure Monitor Metrics data plane API](/rest/api/monitor/metrics-data-plane/) is a high-volume API designed for customers with large volume metrics queries. It's similar to the existing standard Azure Monitor Metrics REST API, but provides the capability to retrieve metric data for up to 50 resource IDs in the same subscription and region in a single batch API call. This improves query throughput and reduces the risk of throttling.
65+
- **Azure Monitor Metrics Batch REST API** - [Azure Monitor Metrics Batch API](/rest/api/monitor/metrics-batch/) is a high-volume API designed for customers with large volume metrics queries. It's similar to the existing standard Azure Monitor Metrics REST API, but provides the capability to retrieve metric data for up to 50 resource IDs in the same subscription and region in a single batch API call. This improves query throughput and reduces the risk of throttling.
6666

6767
## Security
6868

@@ -73,8 +73,8 @@ Secure connection is established between the agent and the Azure Monitor service
7373
## Metrics Explorer
7474

7575
Use [Metrics Explorer](metrics-charts.md) to interactively analyze the data in your metric database and chart the values of multiple metrics over time. You can pin the charts to a dashboard to view them with other visualizations. You can also retrieve metrics by using the [Azure monitoring REST API](./rest-api-walkthrough.md).
76-
77-
![Screenshot that shows an example graph in Metrics Explorer that displays server requests, server response time, and failed requests.](media/data-platform-metrics/metrics-explorer.png)
76+
<!-- convertborder later -->
77+
:::image type="content" source="media/data-platform-metrics/metrics-explorer.png" lightbox="media/data-platform-metrics/metrics-explorer.png" alt-text="Screenshot that shows an example graph in Metrics Explorer that displays server requests, server response time, and failed requests." border="false":::
7878

7979
For more information, see [Analyze metrics with Azure Monitor metrics explorer](./analyze-metrics.md).
8080

articles/azure-monitor/essentials/diagnostic-settings-policy.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,24 @@ For details on creating an initiative, see [Create and assign an initiative defi
8080

8181
- Set **Category** to **Monitoring** to group it with related built-in and custom policy definitions.
8282
- Instead of specifying the details for the Log Analytics workspace and the event hub for policy definitions included in the initiative, use a common initiative parameter. This parameter allows you to easily specify a common value for all policy definitions and change that value if necessary.
83-
84-
![Screenshot that shows settings for initiative definition.](media/diagnostic-settings-policy/initiative-definition.png)
83+
<!-- convertborder later -->
84+
:::image type="content" source="media/diagnostic-settings-policy/initiative-definition.png" lightbox="media/diagnostic-settings-policy/initiative-definition.png" alt-text="Screenshot that shows settings for initiative definition." border="false":::
8585

8686
## Assignment
8787
Assign the initiative to an Azure management group, subscription, or resource group, depending on the scope of your resources to monitor. A [management group](../../governance/management-groups/overview.md) is useful for scoping policy, especially if your organization has multiple subscriptions.
88-
89-
![Screenshot of the settings for the Basics tab in the Assign initiative section of the Diagnostic settings to Log Analytics workspace in the Azure portal.](media/diagnostic-settings-policy/initiative-assignment.png)
88+
<!-- convertborder later -->
89+
:::image type="content" source="media/diagnostic-settings-policy/initiative-assignment.png" lightbox="media/diagnostic-settings-policy/initiative-assignment.png" alt-text="Screenshot of the settings for the Basics tab in the Assign initiative section of the Diagnostic settings to Log Analytics workspace in the Azure portal." border="false":::
9090

9191
By using initiative parameters, you can specify the workspace or any other details once for all of the policy definitions in the initiative.
92-
93-
![Screenshot that shows initiative parameters on the Parameters tab.](media/diagnostic-settings-policy/initiative-parameters.png)
92+
<!-- convertborder later -->
93+
:::image type="content" source="media/diagnostic-settings-policy/initiative-parameters.png" lightbox="media/diagnostic-settings-policy/initiative-parameters.png" alt-text="Screenshot that shows initiative parameters on the Parameters tab." border="false":::
9494

9595
## Remediation
9696
The initiative will be applied to each virtual machine as it's created. A [remediation task](../../governance/policy/how-to/remediate-resources.md) deploys the policy definitions in the initiative to existing resources, so you can create diagnostic settings for any resources that were already created.
9797

9898
When you create the assignment by using the Azure portal, you have the option of creating a remediation task at the same time. See [Remediate non-compliant resources with Azure Policy](../../governance/policy/how-to/remediate-resources.md) for details on the remediation.
99-
100-
![Screenshot that shows initiative remediation for a Log Analytics workspace.](media/diagnostic-settings-policy/initiative-remediation.png)
99+
<!-- convertborder later -->
100+
:::image type="content" source="media/diagnostic-settings-policy/initiative-remediation.png" lightbox="media/diagnostic-settings-policy/initiative-remediation.png" alt-text="Screenshot that shows initiative remediation for a Log Analytics workspace." border="false":::
101101

102102
## Troubleshooting
103103

0 commit comments

Comments
 (0)