Merge pull request #196982 from yegu-ms/main

ShannonLeavitt · web-flow · commit 5147a7e612cd · 2022-05-04T10:48:25.000-06:00
Updated content based on user feedback
diff --git a/articles/managed-grafana/how-to-data-source-plugins-managed-identity.md b/articles/managed-grafana/how-to-data-source-plugins-managed-identity.md
@@ -1,5 +1,5 @@
 ---
-title: How to configure data sources for Azure Managed Grafana Preview with Managed Identity
+title: How to configure data sources for Azure Managed Grafana Preview
 description: In this how-to guide, discover how you can configure data sources for Azure Managed Grafana using Managed Identity.
 author: maud-lv 
 ms.author: malev 
@@ -8,7 +8,7 @@ ms.topic: how-to
 ms.date: 3/31/2022 
 ---
 
-# How to configure data sources for Azure Managed Grafana Preview with Managed Identity
+# How to configure data sources for Azure Managed Grafana Preview
 
 ## Prerequisites
 
@@ -51,7 +51,7 @@ You can find all available Grafana data sources by going to your workspace and s
 
    :::image type="content" source="media/managed-grafana-how-to-source-plugins.png" alt-text="Screenshot of the Add data source page.":::
 
-## Default data sources in an Azure Managed Grafana workspace
+## Default configuration for Azure Monitor
 
 The Azure Monitor data source is automatically added to all new Managed Grafana resources. To review or modify its configuration, follow these steps in your workspace endpoint:
 
@@ -66,15 +66,8 @@ The Azure Monitor data source is automatically added to all new Managed Grafana
 
 Authentication and authorization are subsequently made through the provided managed identity. With Managed Identity, you can assign permissions for your Managed Grafana workspace to access Azure Monitor data without having to manually manage service principals in Azure Active Directory (Azure AD).
 
-## Manually assign permissions for Managed Grafana to access data in Azure
-
-Azure Managed Grafana automatically configures the **Monitoring Reader** role for accessing all the Azure Monitor data and Log Analytics resources in your subscription. To change this:
-
-1. Go to the Log Analytics resource that contains the monitoring data you want to visualize.
-1. Select **Access Control (IAM)**.
-1. Search for your Managed Grafana workspace and change the permission.
-
 ## Next steps
 
 > [!div class="nextstepaction"]
+> [Modify access permissions to Azure Monitor](./how-to-permissions.md)
 > [Share an Azure Managed Grafana workspace](./how-to-share-grafana-workspace.md)
diff --git a/articles/managed-grafana/how-to-permissions.md b/articles/managed-grafana/how-to-permissions.md
@@ -1,14 +1,14 @@
 ---
-title: How to configure permissions for Azure Managed Grafana
-description: Learn how to manually configure access permissions with roles for your Azure Managed Grafana Preview workspace  
+title: How to modify access permissions to Azure Monitor
+description: Learn how to manually set up permissions that allow your Azure Managed Grafana Preview workspace to access a data source
 author: maud-lv 
 ms.author: malev 
 ms.service: managed-grafana 
 ms.topic: how-to 
 ms.date: 3/31/2022 
 ---
 
-# How to configure permissions for Azure Managed Grafana Preview
+# How to modify access permissions to Azure Monitor
 
 By default, when a Grafana workspace is created, Azure Managed Grafana grants it the Monitoring Reader role for all Azure Monitor data and Log Analytics resources within a subscription.
 
@@ -26,9 +26,9 @@ In this article, you'll learn how to manually edit permissions for a specific re
 
 Sign in to the Azure portal at [https://portal.azure.com/](https://portal.azure.com/) with your Azure account.
 
-## Assign permissions for an Azure Managed Grafana workspace to access data in Azure
+## Edit Azure Monitor permissions for an Azure Managed Grafana workspace
 
-To edit permissions for a specific resource, follow these steps:
+To change permissions for a specific resource, follow these steps:
 
 1. Open a resource that contains the monitoring data you want to retrieve. In this example, we're configuring an Application Insights resource.
 1. Select **Access Control (IAM)**.
@@ -57,4 +57,4 @@ To edit permissions for a specific resource, follow these steps:
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Configure data source plugins for Azure Managed Grafana with Managed Identity](./how-to-data-source-plugins-managed-identity.md)
+> [How to configure data sources for Azure Managed Grafana](./how-to-data-source-plugins-managed-identity.md)
diff --git a/articles/managed-grafana/how-to-share-grafana-workspace.md b/articles/managed-grafana/how-to-share-grafana-workspace.md
@@ -27,7 +27,10 @@ Azure Managed Grafana supports the Admin, Viewer and Editor roles:
 
 The Admin role is automatically assigned to the creator of a Grafana workspace. More details on Admin, Editor, and Viewer roles can be found at [Grafana organization roles](https://grafana.com/docs/grafana/latest/permissions/organization_roles/#compare-roles).
 
-Grafana user roles and assignments are fully integrated with the Azure Active Directory. You can manage these permissions from the Azure portal or the command line. This section explains how to assign users to the Viewer or Editor role in the Azure portal.
+Grafana user roles and assignments are fully integrated with the Azure Active Directory (Azure AD). You can add any Azure AD user or security group to a Grafana role and grant them access permissions associated with that role. You can manage these permissions from the Azure portal or the command line. This section explains how to assign users to the Viewer or Editor role in the Azure portal.
+
+> [!NOTE]
+> Azure Managed Grafana doesn't support personal [Microsoft accounts](https://account.microsoft.com) (a.k.a., MSA) currently.
 
 ## Sign in to Azure
 
@@ -55,6 +58,6 @@ Sign in to the Azure portal at [https://portal.azure.com/](https://portal.azure.
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Configure permissions for Managed Grafana](./how-to-data-source-plugins-managed-identity.md)
-> [Configure data source plugins for Azure Managed Grafana with Managed Identity](./how-to-data-source-plugins-managed-identity.md)
-> [How to call Grafana APIs in your automation with Azure Managed Grafana Preview](./how-to-api-calls.md)
+> [How to configure data sources for Azure Managed Grafana](./how-to-data-source-plugins-managed-identity.md)
+> [How to modify access permissions to Azure Monitor](./how-to-permissions.md)
+> [How to call Grafana APIs in your automation with Azure Managed Grafana](./how-to-api-calls.md)
diff --git a/articles/managed-grafana/quickstart-managed-grafana-portal.md b/articles/managed-grafana/quickstart-managed-grafana-portal.md
@@ -68,5 +68,5 @@ You can now start interacting with the Grafana application to configure data sou
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Configure permissions for Azure Managed Grafana Preview](./how-to-data-source-plugins-managed-identity.md)
-> [Configure data source plugins for Azure Managed Grafana Preview with Managed Identity](./how-to-data-source-plugins-managed-identity.md)
+> [How to configure data sources for Azure Managed Grafana](./how-to-data-source-plugins-managed-identity.md)
+> [How to modify access permissions to Azure Monitor](./how-to-permissions.md)
diff --git a/articles/managed-grafana/toc.yml b/articles/managed-grafana/toc.yml
@@ -12,10 +12,10 @@ items:
     href: quickstart-managed-grafana-portal.md
 - name: How-to guides
   items:
-  - name: Configure Permissions for Managed Grafana
-    href: how-to-permissions.md
-  - name: Configure data source plugins with Managed Identity
+  - name: Configure data source plugins
     href: how-to-data-source-plugins-managed-identity.md
+  - name: Modify access permissions to Azure Monitor
+    href: how-to-permissions.md
   - name: Share your Managed Grafana workspace
     href: how-to-share-grafana-workspace.md
   - name: Call Grafana APIs programmatically
