Skip to content

Commit db36f0a

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 2ba41c4 + c45db05 commit db36f0a

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
lines changed

articles/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
1212
ms.subservice: pim
13-
ms.date: 10/07/2021
13+
ms.date: 10/20/2022
1414
ms.author: amsliu
1515
ms.custom: pim
1616
ms.collection: M365-identity-device-management
@@ -26,9 +26,6 @@ The need for access to privileged Azure resource and Azure AD roles by employees
2626

2727
To create access reviews for Azure resources, you must be assigned to the [Owner](../../role-based-access-control/built-in-roles.md#owner) or the [User Access Administrator](../../role-based-access-control/built-in-roles.md#user-access-administrator) role for the Azure resources. To create access reviews for Azure AD roles, you must be assigned to the [Global Administrator](../roles/permissions-reference.md#global-administrator) or the [Privileged Role Administrator](../roles/permissions-reference.md#privileged-role-administrator) role.
2828

29-
> [!Note]
30-
> In public preview, you can scope an access review to service principals with access to Azure AD and Azure resource roles with an Azure Active Directory Premium P2 edition active in your tenant. After general availability, additional licenses might be required.
31-
3229
## Create access reviews
3330

3431
1. Sign in to [Azure portal](https://portal.azure.com/) as a user that is assigned to one of the prerequisite role(s).
@@ -37,7 +34,7 @@ The need for access to privileged Azure resource and Azure AD roles by employees
3734

3835
3. For **Azure AD roles**, select **Azure AD roles** under **Privileged Identity Management**. For **Azure resources**, select **Azure resources** under **Privileged Identity Management**.
3936

40-
:::image type="content" source="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png" alt-text="Select Identity Governance in Azure Portal screenshot." lightbox="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png":::
37+
:::image type="content" source="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png" alt-text="Select Identity Governance in the Azure portal screenshot." lightbox="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png":::
4138

4239
4. For **Azure AD roles**, select **Azure AD roles** again under **Manage**. For **Azure resources**, select the subscription you want to manage.
4340

articles/azure-arc/vmware-vsphere/support-matrix-for-arc-enabled-vmware-vsphere.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ The following firewall URL exceptions are needed for the Azure Arc resource brid
4646
| Azure Arc Identity service | 443 | https://*.his.arc.azure.com | Appliance VM IP and control plane endpoint need outbound connection. | Manages identity and access control for Azure resources |
4747
| Azure Arc configuration service | 443 | https://*.dp.kubernetesconfiguration.azure.com | Appliance VM IP and control plane endpoint need outbound connection. | Used for Kubernetes cluster configuration. |
4848
| Cluster connect service | 443 | https://*.servicebus.windows.net | Appliance VM IP and control plane endpoint need outbound connection. | Provides cloud-enabled communication to connect on-premises resources with the cloud. |
49-
| Guest Notification service | 443 | https://guestnotificationservice.azure.com | Appliance VM IP and control plane endpoint need outbound connection. | Used to connect on-premises resources to Azure. |
49+
| Guest Notification service | 443 | `https://guestnotificationservice.azure.com` | Appliance VM IP and control plane endpoint need outbound connection. | Used to connect on-premises resources to Azure. |
5050
| SFS API endpoint | 443 | msk8s.api.cdp.microsoft.com | Host machine, Appliance VM IP and control plane endpoint need outbound connection. | Used when downloading product catalog, product bits, and OS images from SFS. |
5151
| Resource bridge (appliance) Dataplane service | 443 | https://*.dp.prod.appliances.azure.com | Appliance VM IP and control plane endpoint need outbound connection. | Communicate with resource provider in Azure. |
52-
| Resource bridge (appliance) container image download | 443 | *.blob.core.windows.net, https://ecpacr.azurecr.io | Appliance VM IP and control plane endpoint need outbound connection. | Required to pull container images. |
52+
| Resource bridge (appliance) container image download | 443 | *.blob.core.windows.net, `https://ecpacr.azurecr.io` | Appliance VM IP and control plane endpoint need outbound connection. | Required to pull container images. |
5353
| Resource bridge (appliance) image download | 80 | *.dl.delivery.mp.microsoft.com | Host machine, Appliance VM IP and control plane endpoint need outbound connection. | Download the Arc resource bridge OS images. |
54-
| Azure Arc for K8s container image download | 443 | https://azurearcfork8sdev.azurecr.io | Appliance VM IP and control plane endpoint need outbound connection. | Required to pull container images. |
54+
| Azure Arc for K8s container image download | 443 | `https://azurearcfork8sdev.azurecr.io` | Appliance VM IP and control plane endpoint need outbound connection. | Required to pull container images. |
5555
| ADHS telemetry service | 443 | adhs.events.data.microsoft.com | Appliance VM IP and control plane endpoint need outbound connection. Runs inside the appliance/mariner OS. | Used periodically to send Microsoft required diagnostic data from control plane nodes. Used when telemetry is coming off Mariner, which would mean any K8s control plane. |
5656
| Microsoft events data service | 443 | v20.events.data.microsoft.com | Appliance VM IP and control plane endpoint need outbound connection. | Used periodically to send Microsoft required diagnostic data from the Azure Stack HCI or Windows Server host. Used when telemetry is coming off Windows like Windows Server or HCI. |
5757
| vCenter Server | 443 | URL of the vCenter server | Appliance VM IP and control plane endpoint need outbound connection. | Used to by the vCenter server to communicate with the Appliance VM and the control plane.|

articles/azure-maps/creator-indoor-maps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ The following example shows how to update a dataset, create a new tileset, and d
283283
[tileset]: /rest/api/maps/v20220901preview/tileset
284284
[style-picker-control]: choose-map-style.md#add-the-style-picker-control
285285
[style-how-to]: how-to-create-custom-styles.md
286-
[map-config-api]: /rest/api/maps/v20220901preview/mapconfiguration
286+
[map-config-api]: /rest/api/maps/v20220901preview/map-configuration
287287
[instantiate-indoor-manager]: how-to-use-indoor-module.md#instantiate-the-indoor-manager
288288
[style editor]: https://azure.github.io/Azure-Maps-Style-Editor

articles/azure-maps/how-to-use-indoor-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ Learn more about how to add more data to your map:
275275
> [!div class="nextstepaction"]
276276
> [Code samples](/samples/browse/?products=azure-maps)
277277
278-
[mapConfiguration]: /rest/api/maps/v20220901preview/mapconfiguration
278+
[mapConfiguration]: /rest/api/maps/v20220901preview/map-configuration
279279
[tutorial]: tutorial-creator-indoor-maps.md
280280
[geos]: geographic-scope.md
281281
[visual style editor]: https://azure.github.io/Azure-Maps-Style-Editor/

articles/cost-management-billing/savings-plan/discount-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ms.service: cost-management-billing
99
ms.subservice: reservations
1010
ms.custom: ignite-2022
1111
ms.topic: conceptual
12-
ms.date: 10/14/2022
12+
ms.date: 10/20/2022
1313
---
1414

1515
# How saving plan discount is applied
1616

17-
Azure savings plans save you money when you have consistent usage of Azure compute resources. An Azure savings plan can help you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. The savings can significantly reduce your resource costs by up to 66% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
17+
Azure savings plans save you money when you have consistent usage of Azure compute resources. An Azure savings plan can help you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. The savings can significantly reduce your resource costs by up to 65% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
1818

1919
Each hour with savings plan, your eligible compute usage is discounted until you reach your commitment amount – subsequent usage after you reach your commitment amount is priced at pay-as-you-go rates. To be eligible for a savings plan benefit, the usage must be generated by a resource within the savings plan's scope. Each hour's benefit is _use-it-or-lose-it_, and can't be rolled over to another hour.
2020

articles/cost-management-billing/savings-plan/savings-plan-compute-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ ms.service: cost-management-billing
88
ms.subservice: reservations
99
ms.custom: ignite-2022
1010
ms.topic: overview
11-
ms.date: 10/12/2022
11+
ms.date: 10/20/2022
1212
ms.author: banders
1313
---
1414

1515
# What are Azure savings plans for compute?
1616

17-
Azure savings plans save you money when you have consistent usage of Azure compute resources. An Azure savings plan helps you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. A savings plan can significantly reduce your resource costs by up to 66% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
17+
Azure savings plans save you money when you have consistent usage of Azure compute resources. An Azure savings plan helps you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. A savings plan can significantly reduce your resource costs by up to 65% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
1818

1919
Each hour with savings plan, your compute usage is discounted until you reach your commitment amount – subsequent usage afterward is priced at pay-as-you-go rates. Savings plan commitments are priced in USD for Microsoft Customer Agreement and Microsoft Partner Agreement customers, and in local currency for Enterprise Agreement customers. Usage from compute services such as VMs, dedicated hosts, container instances, Azure premium functions, and Azure app services are eligible for savings plan discounts.
2020

articles/networking/index.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,12 @@ additionalContent:
191191
# Card
192192
- title: DDoS protection
193193
links:
194-
- text: What is Azure DDoS Protection Standard?
195-
url: ../ddos-protection/manage-ddos-protection.md
196-
- text: Manage DDoS Protection
194+
- text: What is Azure DDoS Protection?
195+
url: ../ddos-protection/ddos-protection-overview.md
196+
- text: Create DDoS Network Protection
197197
url: ../ddos-protection/manage-ddos-protection.md
198+
- text: Create DDoS IP Protection
199+
url: ../ddos-protection/manage-ddos-protection-powershell-ip.md
198200
- text: See more
199201
url: ../ddos-protection/index.yml
200202

0 commit comments

Comments
 (0)