Skip to content

Commit 24cc464

Browse files
authored
Merge branch 'MicrosoftDocs:main' into gennadyk9076
2 parents 15916b2 + 56f7e4b commit 24cc464

File tree

111 files changed

+2029
-721
lines changed

Some content is hidden

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

111 files changed

+2029
-721
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
title: Export cost savings in Azure Advisor
3+
ms.topic: article
4+
ms.date: 02/06/2024
5+
description: Export cost savings in Azure Advisor and calculate the aggregated potential yearly savings by using the cost savings amount for each recommendation.
6+
---
7+
8+
# Export cost savings
9+
10+
To calculate aggregated potential yearly savings, follow these steps:
11+
12+
1. Sign in to the [**Azure portal**](https://portal.azure.com).
13+
14+
1. Search for and select [**Advisor**](https://aka.ms/azureadvisordashboard) from any page.\
15+
The Advisor **Overview** page opens.
16+
17+
1. Export cost recommendations by navigating to the **Cost** tab on the left navigation menu and choosing **Download as CSV**.
18+
19+
1. Use the cost savings amount for each recommendation to calculate aggregated potential yearly savings.
20+
21+
[![Screenshot of the Azure Advisor cost recommendations page that shows download option.](./media/advisor-how-to-calculate-total-cost-savings.png)](./media/advisor-how-to-calculate-total-cost-savings.png#lightbox)
22+
23+
> [!NOTE]
24+
> Recommendations show savings individually, and may overlap with the savings shown in other recommendations, for example – you can only benefit from savings plans for compute or reservations for virtual machines, but not from both.
25+

articles/advisor/advisor-reference-operational-excellence-recommendations.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,15 @@ Virtual Network flow log allows you to record IP traffic flowing in a virtual ne
516516

517517
Learn more about [Resource - UpgradeNSGToVnetFlowLog (Upgrade NSG flow logs to VNet flow logs)](https://aka.ms/vnetflowlogspreviewdocs).
518518

519+
### Migrate Azure Front Door (classic) to Standard/Premium tier
519520

521+
On 31 March 2027, Azure Front Door (classic) will be retired for the public cloud, and you’ll need to migrate to Front Door Standard or Premium by that date.
522+
523+
Beginning 1 April 2025, you’ll no longer be able to create new Front Door (classic) resources via the Azure portal, Terraform, or any command line tools. However, you can continue to make modifications to existing resources until Front Door (classic) is fully retired.
524+
525+
Azure Front Door Standard and Premium combine the capabilities of static and dynamic content delivery with turnkey security, enhanced DevOps experiences, simplified pricing, and better Azure integrations
526+
527+
Learn more about [Azure Front Door (classic) will be retired on 31 March 2027](https://azure.microsoft.com/updates/azure-front-door-classic-will-be-retired-on-31-march-2027/).
520528

521529

522530

89.3 KB
Loading

articles/advisor/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
href: advisor-azure-resource-graph.md
7575
- name: Consume Advisor score
7676
href: azure-advisor-score.md
77+
- name: Export cost savings
78+
href: advisor-how-to-calculate-total-cost-savings.md
7779
- name: Reference
7880
items:
7981
- name: Security baseline

articles/ai-services/document-intelligence/faq.yml

Lines changed: 183 additions & 186 deletions
Large diffs are not rendered by default.

articles/ai-services/openai/concepts/models.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 03/14/2024
7+
ms.date: 04/04/2024
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -189,6 +189,14 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
189189

190190
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
191191

192+
#### Azure Government regions
193+
194+
The following GPT-3.5 turbo models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
195+
196+
|Model ID | Model Availability |
197+
|--|--|
198+
| `gpt-35-turbo` (1106-Preview) | US Gov Virginia |
199+
192200
### Embeddings models
193201

194202
These models can only be used with Embedding API requests.

articles/aks/app-routing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ With the retirement of [Open Service Mesh][open-service-mesh-docs] (OSM) by the
4343
- All global Azure DNS zones integrated with the add-on have to be in the same resource group.
4444
- All private Azure DNS zones integrated with the add-on have to be in the same resource group.
4545
- Editing the ingress-nginx `ConfigMap` in the `app-routing-system` namespace isn't supported.
46+
- The following snippet annotations are blocked and will prevent an Ingress from being configured: `load_module`, `lua_package`, `_by_lua`, `location`, `root`, `proxy_pass`, `serviceaccount`, `{`, `}`, `'`.
4647

4748
## Enable application routing using Azure CLI
4849

articles/aks/howto-deploy-java-liberty-app.md

Lines changed: 73 additions & 64 deletions
Large diffs are not rendered by default.

articles/aks/howto-deploy-java-quarkus-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Deploy Quarkus on Azure Kubernetes Service"
33
description: Shows how to quickly stand up Quarkus on Azure Kubernetes Service.
4-
author: edburns
4+
author: KarlErickson
55
ms.author: edburns
66
ms.service: azure-kubernetes-service
77
ms.topic: how-to
@@ -60,7 +60,7 @@ Instead of `quarkus dev`, you can accomplish the same thing with Maven by using
6060

6161
You may be asked if you want to send telemetry of your usage of Quarkus dev mode. If so, answer as you like.
6262

63-
Quarkus dev mode enables live reload with background compilation. If you modify any aspect of your app source code and refresh your browser, you can see the changes. If there are any issues with compilation or deployment, an error page lets you know. Quarkus dev mode listens for a debugger on port 5005. If you want to wait for the debugger to attach before running, pass `-Dsuspend` on the command line. If you dont want the debugger at all, you can use `-Ddebug=false`.
63+
Quarkus dev mode enables live reload with background compilation. If you modify any aspect of your app source code and refresh your browser, you can see the changes. If there are any issues with compilation or deployment, an error page lets you know. Quarkus dev mode listens for a debugger on port 5005. If you want to wait for the debugger to attach before running, pass `-Dsuspend` on the command line. If you don't want the debugger at all, you can use `-Ddebug=false`.
6464

6565
The output should look like the following example:
6666

articles/aks/howto-deploy-java-wls-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Deploy WebLogic Server on Azure Kubernetes Service using the Azure portal"
33
description: Shows how to quickly stand up WebLogic Server on Azure Kubernetes Service.
4-
author: edburns
4+
author: KarlErickson
55
ms.author: edburns
66
ms.topic: how-to
77
ms.date: 02/09/2024
@@ -454,7 +454,7 @@ Use the following steps to build the image:
454454
=> => naming to docker.io/library/model-in-image:WLS-v1 0.2s
455455
```
456456
457-
1. If you have successfully created the image, then it should now be in your local machines Docker repository. You can verify the image creation by using the following command:
457+
1. If you have successfully created the image, then it should now be in your local machine's Docker repository. You can verify the image creation by using the following command:
458458
459459
```text
460460
docker images model-in-image:WLS-v1

0 commit comments

Comments
 (0)