Merge branch 'MicrosoftDocs:main' into main

Author: v-edmckillop

.openpublishing.redirection.active-directory.json

@@ -11065,6 +11065,11 @@
       "source_path_from_root": "/articles/active-directory/privileged-identity-management/groups-features.md",
       "redirect_url": "azure/active-directory/privileged-identity-management/concept-pim-for-groups",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-data-inventory.md",
+      "redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/product-data-billable-resources",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -5671,6 +5671,16 @@
             "source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-cross-service-query.md",
             "redirect_url": "/azure/azure-monitor/logs/azure-monitor-data-explorer-proxy",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/mobile-center-quickstart.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/windows-desktop.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -27970,6 +27970,11 @@
           "redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",
           "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/uptime-sla.md",
+            "redirect_url": "/azure/aks/free-standard-pricing-tiers",
+            "redirect_document_id": "false"
+        },
         {
           "source_path": "articles/dotnet-develop-multitenant-applications.md",
           "redirect_URL": "/azure/architecture/guide/multitenant/overview",

articles/active-directory-b2c/partner-datawiza.md

@@ -9,7 +9,7 @@ ms.reviewer: kengaderdus
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 12/12/2022
+ms.date: 01/23/2023
 ms.author: gasinh
 ms.subservice: B2C
 ---

articles/active-directory/cloud-infrastructure-entitlement-management/TOC.yml

@@ -31,14 +31,14 @@
       - name: View key statistics and data about your authorization system
         href: ui-dashboard.md
       - name: View data about the activity in your authorization system
-        href: product-dashboard.md
-    - name: Configure settings for data collection
+        href: product-dashboard.md  
+    - name: View information about your Authorization Systems
       expanded: false
       items:
       - name: View and configure settings for data collection
         href: product-data-sources.md
-      - name: Display an inventory of created resources and licenses 
-        href: product-data-inventory.md
+      - name: View current billable resources in your authorization system
+        href: product-data-billable-resources.md
     - name: Manage organizational and personal information
       expanded: false
       items:
@@ -143,7 +143,7 @@
         href: report-view-system-report.md
       - name: Create, view, and share a custom report
         href: report-create-custom-report.md
-      - name: Generate and download the Permissions analytics report
+      - name: View and download the Permissions analytics report
         href: product-permissions-analytics-reports.md
   - name: Troubleshoot
     expanded: false

articles/active-directory/cloud-infrastructure-entitlement-management/faqs.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: faq
-ms.date: 04/20/2022
+ms.date: 01/25/2023
 ms.author: jfields
 ---
 
@@ -141,7 +141,19 @@ We also have the ability to remove, export or modify specific data should the Gl
 ## Do I require a license to use Entra Permissions Management? 
 
 Yes, as of July 1st, 2022, new customers must acquire a free 45-day trial license or a paid license to use the service. You can enable a trial here: [https://aka.ms/TryPermissionsManagement](https://aka.ms/TryPermissionsManagement) or you can directly purchase resource-based licenses here: [https://aka.ms/BuyPermissionsManagement](https://aka.ms/BuyPermissionsManagement) 
- 
+
+## How is Permissions Management priced? 
+
+Permissions Management is $125 per resources/year ($10.40 per resource/month). Permissions Management requires licenses for workloads, which include any resource that uses compute or memory. 
+
+## Do I need to pay for all resources?
+
+Although Permissions Management supports all resources, Microsoft only requires licenses for certain resources per cloud. To learn more about billable resources, visit [View billable resources listed in your authorization system](product-data-billable-resources.md)
+
+## How do I figure out how many resources I have? 
+
+To find out how many resources you have across your multicloud infrastructure, view the Billable Resources tab in Permissions Management.
+
 ## What do I do if I’m using Public Preview version of Entra Permissions Management?  
 
 If you are using the Public Preview version of Entra Permissions Management, your current deployment(s) will continue to work through October 1st.  

articles/active-directory/cloud-infrastructure-entitlement-management/media/onboard-enable-tenant/billable-resources.png

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: ciem
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/23/2022
+ms.date: 01/25/2023
 ms.author: jfields
 ---
 
@@ -25,6 +25,9 @@ The Permissions Management **Dashboard** provides an overview of the authorizati
 
    The **Permission Creep Index (PCI)** chart updates to display information about the accounts and folders you selected. The number of days since the information was last updated displays in the upper right corner.
 
+   >[!NOTE]
+   >Default and GCP-managed service accounts are not included in the PCI calculation.
+
 1. In the Permission Creep Index (PCI) graph, select a bubble.
 
     The bubble displays the number of identities that are considered high-risk.

articles/active-directory/cloud-infrastructure-entitlement-management/product-dashboard.md

@@ -0,0 +1,42 @@
+---
+title: View current billable resources in your authorization systems
+description: How to view current billable resources in your authorization system in Permissions Management.
+services: active-directory
+author: jenniferf-skc
+manager: amycolannino
+ms.service: active-directory 
+ms.subservice: ciem
+ms.workload: identity
+ms.topic: how-to
+ms.date: 01/25/2023
+ms.author: jfields
+---
+
+# View billable resources listed in your authorization system
+
+Gain insight into current billable resources listed in your authorization system. In Microsoft Entra Permissions Management, a billable resource is defined as a cloud service that uses compute or memory and requires a license. The Permissions Management Billable Resources tab shows you which resources are in your authorization system, and how many of them you're being billed for.
+
+Here is the current list of resources per cloud provider. This list is subject to change as cloud providers add more services in the future.
+
+:::image type="content" source="media/onboard-enable-tenant/billable-resources.png" alt-text="A table of current Microsoft billable resources." lightbox="media/onboard-enable-tenant/billable-resources.png":::
+
+## View resources in your authorization system
+
+1. To access your billable resource information, from the Permissions Management home page, select Settings (gear icon).
+1. Select the Billable Resources tab.
+1. Select your Authorization System:
+
+    - **AWS** for Amazon Web Services.
+    - **Azure** for Microsoft Azure.
+    - **GCP** for Google Cloud Platform.
+
+    The interface displays information showing which resource you have in your Authorization System per category.
+
+1. To change the columns displayed in the table, select **Columns**, and then select the information you want to display.
+
+    - To discard your changes, select **Reset to default**.
+
+
+## Next steps
+
+- For information about viewing and configuring settings for collecting data from your authorization system and its associated accounts, see [View and configure settings for data collection](product-data-sources.md).