Skip to content

Commit c249078

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into DICOMcleanup
2 parents 11ddb92 + eb742bd commit c249078

File tree

71 files changed

+9173
-1095
lines changed

Some content is hidden

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

71 files changed

+9173
-1095
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4574,6 +4574,16 @@
45744574
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
45754575
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
45764576
"redirect_document_id": false
4577+
},
4578+
{
4579+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-powershell.md",
4580+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4581+
"redirect_document_id": false
4582+
},
4583+
{
4584+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-cli.md",
4585+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4586+
"redirect_document_id": false
45774587
}
45784588
]
45794589
}

articles/ai-studio/how-to/deploy-models-phi-3-5-moe.md

Lines changed: 1153 additions & 0 deletions
Large diffs are not rendered by default.

articles/ai-studio/how-to/deploy-models-phi-3-5-vision.md

Lines changed: 1429 additions & 0 deletions
Large diffs are not rendered by default.

articles/ai-studio/how-to/deploy-models-phi-3-vision.md

Lines changed: 44 additions & 42 deletions
Large diffs are not rendered by default.

articles/ai-studio/how-to/deploy-models-phi-3.md

Lines changed: 108 additions & 154 deletions
Large diffs are not rendered by default.

articles/ai-studio/how-to/model-catalog-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Llama family models | Llama-2-7b <br> Llama-2-7b-chat <br> Llama-2-13b <br> Llam
6868
Mistral family models | mistralai-Mixtral-8x22B-v0-1 <br> mistralai-Mixtral-8x22B-Instruct-v0-1 <br> mistral-community-Mixtral-8x22B-v0-1 <br> mistralai-Mixtral-8x7B-v01 <br> mistralai-Mistral-7B-Instruct-v0-2 <br> mistralai-Mistral-7B-v01 <br> mistralai-Mixtral-8x7B-Instruct-v01 <br> mistralai-Mistral-7B-Instruct-v01 | Mistral-large (2402) <br> Mistral-large (2407) <br> Mistral-small <br> Mistral-NeMo
6969
Cohere family models | Not available | Cohere-command-r-plus <br> Cohere-command-r <br> Cohere-embed-v3-english <br> Cohere-embed-v3-multilingual <br> Cohere-rerank-v3-english <br> Cohere-rerank-v3-multilingual
7070
JAIS | Not available | jais-30b-chat
71-
Phi-3 family models | Phi-3-mini-4k-Instruct <br> Phi-3-mini-128k-Instruct <br> Phi-3-small-8k-Instruct <br> Phi-3-small-128k-Instruct <br> Phi-3-medium-4k-instruct <br> Phi-3-medium-128k-instruct | Phi-3-mini-4k-Instruct <br> Phi-3-mini-128k-Instruct <br> Phi-3-small-8k-Instruct <br> Phi-3-small-128k-Instruct <br> Phi-3-medium-4k-instruct <br> Phi-3-medium-128k-instruct
71+
Phi-3 family models | Phi-3-mini-4k-Instruct <br> Phi-3-mini-128k-Instruct <br> Phi-3-small-8k-Instruct <br> Phi-3-small-128k-Instruct <br> Phi-3-medium-4k-instruct <br> Phi-3-medium-128k-instruct <br> Phi-3-vision-128k-Instruct <br> Phi-3.5-mini-Instruct <br> Phi-3.5-vision-Instruct <br> Phi-3.5-MoE-Instruct | Phi-3-mini-4k-Instruct <br> Phi-3-mini-128k-Instruct <br> Phi-3-small-8k-Instruct <br> Phi-3-small-128k-Instruct <br> Phi-3-medium-4k-instruct <br> Phi-3-medium-128k-instruct <br> <br> Phi-3.5-mini-Instruct
7272
Nixtla | Not available | TimeGEN-1
7373
Other models | Available | Not available
7474

articles/ai-studio/includes/region-availability-maas.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ Llama 3.1 8B Instruct <br> Llama 3.1 70B Instruct | [Microsoft Managed Countries
4040
Llama 3.1 405B Instruct | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US <br> East US 2 <br> North Central US <br> South Central US <br> West US <br> West US 3 | Not available |
4141

4242

43-
### Microsoft Phi-3 models
43+
### Microsoft Phi-3 family models
4444

4545
|Model |Offer Availability Region | Hub/Project Region for Deployment | Hub/Project Region for Fine tuning |
4646
|---------|---------|---------|---------|
47+
Phi-3.5-Mini-Instruct | Not applicable | East US 2 <br> Sweden Central | Not available |
4748
Phi-3-Mini-4k-Instruct <br> Phi-3-Mini-128K-Instruct | Not applicable | East US 2 <br> Sweden Central | East US 2 |
4849
Phi-3-Small-8K-Instruct <br> Phi-3-Small-128K-Instruct | Not applicable | East US 2 <br> Sweden Central | Not available |
4950
Phi-3-Medium-4K-Instruct <br> Phi-3-Medium-128K-Instruct | Not applicable | East US 2 <br> Sweden Central | East US 2 |

articles/ai-studio/toc.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,18 @@ items:
9090
href: how-to/deploy-models-openai.md
9191
- name: Fine-tune Azure OpenAI models
9292
href: ../ai-services/openai/how-to/fine-tuning.md?context=/azure/ai-studio/context/context
93-
- name: Phi-3 models
93+
- name: Phi-3 family models
9494
items:
95-
- name: Phi-3 chat models
96-
href: how-to/deploy-models-phi-3.md
97-
- name: Phi-3 chat models with vision
98-
href: how-to/deploy-models-phi-3-vision.md
99-
- name: Fine-tune Phi-3 chat models
100-
href: how-to/fine-tune-phi-3.md
95+
- name: Phi-3 family chat models
96+
href: how-to/deploy-models-phi-3.md
97+
- name: Phi-3.5 MoE chat model
98+
href: how-to/deploy-models-phi-3-5-moe.md
99+
- name: Phi-3 chat model with vision
100+
href: how-to/deploy-models-phi-3-vision.md
101+
- name: Phi-3.5 chat model with vision
102+
href: how-to/deploy-models-phi-3-5-vision.md
103+
- name: Fine-tune Phi-3 chat models
104+
href: how-to/fine-tune-phi-3.md
101105
- name: Cohere models
102106
items:
103107
- name: Cohere Command models

articles/api-management/api-management-gateways-overview.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,18 @@ For details about monitoring options, see [Observability in Azure API Management
143143
| Feature support | Classic | V2 | Consumption | Self-hosted | Workspace |
144144
| --- | --- | ----- | ----- | ---------- | ----- |
145145
| [API analytics](howto-use-analytics.md) | ✔️ | ✔️<sup>1</sup> ||||
146-
| [Application Insights](api-management-howto-app-insights.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
146+
| [Application Insights](api-management-howto-app-insights.md) | ✔️ | ✔️ | ✔️ | ✔️<sup>2</sup> | ✔️ |
147147
| [Logging through Event Hubs](api-management-howto-log-event-hubs.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
148148
| [Metrics in Azure Monitor](api-management-howto-use-azure-monitor.md#view-metrics-of-your-apis) | ✔️ | ✔️ |✔️ | ✔️ ||
149149
| [OpenTelemetry Collector](how-to-deploy-self-hosted-gateway-kubernetes-opentelemetry.md) |||| ✔️ ||
150-
| [Request logs in Azure Monitor and Log Analytics](api-management-howto-use-azure-monitor.md#resource-logs) | ✔️ | ✔️ || ❌<sup>2</sup> ||
150+
| [Request logs in Azure Monitor and Log Analytics](api-management-howto-use-azure-monitor.md#resource-logs) | ✔️ | ✔️ || ❌<sup>3</sup> ||
151151
| [Local metrics and logs](how-to-configure-local-metrics-logs.md) |||| ✔️ ||
152-
| [Request tracing](api-management-howto-api-inspector.md) | ✔️ | ❌<sup>3</sup> | ✔️ | ✔️ ||
152+
| [Request tracing](api-management-howto-api-inspector.md) | ✔️ | ❌<sup>4</sup> | ✔️ | ✔️ ||
153153

154154
<sup>1</sup> The v2 tiers support Azure Monitor-based analytics.<br/>
155-
<sup>2</sup> The self-hosted gateway currently doesn't send resource logs (diagnostic logs) to Azure Monitor. Optionally [send metrics](how-to-configure-cloud-metrics-logs.md) to Azure Monitor, or [configure and persist logs locally](how-to-configure-local-metrics-logs.md) where the self-hosted gateway is deployed.<br/>
156-
<sup>3</sup> Tracing is currently unavailable in the v2 tiers.
155+
<sup>2</sup> Gateway uses [Azure Application Insight's built-in memory buffer](./../azure-monitor/app/telemetry-channels.md#built-in-telemetry-channels) and does not provide delivery guarantees.<br/>
156+
<sup>3</sup> The self-hosted gateway currently doesn't send resource logs (diagnostic logs) to Azure Monitor. Optionally [send metrics](how-to-configure-cloud-metrics-logs.md) to Azure Monitor, or [configure and persist logs locally](how-to-configure-local-metrics-logs.md) where the self-hosted gateway is deployed.<br/>
157+
<sup>4</sup> Tracing is currently unavailable in the v2 tiers.
157158

158159
### Authentication and authorization
159160

articles/api-management/api-management-howto-app-insights.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ You can easily integrate Azure Application Insights with Azure API Management. A
2222
> [!NOTE]
2323
> In an API Management [workspace](workspaces-overview.md), a workspace owner can independently integrate Application Insights and enable Application Insights logging for the workspace's APIs. The general guidance to integrate a workspace with Application Insights is similar to the guidance for an API Management instance; however, configuration is scoped to the workspace only. Currently, you must integrate Application Insights in a workspace by configuring an instrumentation key or connection string.
2424
25+
> [!WARNING]
26+
> When using our [self-hosted gateway](self-hosted-gateway-overview.md), we do not guarantee all telemetry will be pushed to Azure Application Insights given it relies on [Application Insights' in-memory buffering](./../azure-monitor/app/telemetry-channels.md#built-in-telemetry-channels).
27+
2528
## Prerequisites
2629

2730
* You need an Azure API Management instance. [Create one](get-started-create-service-instance.md) first.

0 commit comments

Comments
 (0)