Skip to content

Commit 4348b0c

Browse files
committed
Fix merge issues
1 parent 2fc88e6 commit 4348b0c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

articles/managed-grafana/quickstart-managed-grafana-cli.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Get started using Azure Managed Grafana by creating an Azure Managed Grafana wor
1717

1818
>[!NOTE]
1919
> Azure Managed Grafana has [two pricing plans](overview.md#service-tiers). This guides takes you through creating a new workspace in the Standard plan. To create a workspace in the Essential (preview) plan, [use the Azure portal](quickstart-managed-grafana-portal.md).
20-
> Azure Managed Grafana has [two pricing plans](overview.md#service-tiers). This guides takes you through creating a new workspace in the Standard plan. To create a workspace in the Essential (preview) plan, [use the Azure portal](quickstart-managed-grafana-portal.md).
2120

2221
## Prerequisites
2322

@@ -32,7 +31,6 @@ Get started using Azure Managed Grafana by creating an Azure Managed Grafana wor
3231
> - or consider creating the workspace using the **Creator can admin (Preview)** feature available from the Azure portal as a temporary workaround. [Refer to this quickstart for more information](quickstart-managed-grafana-portal.md).
3332

3433
[!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
35-
[!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
3634

3735
## Sign in to Azure
3836

articles/managed-grafana/quickstart-managed-grafana-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ In this quickstart, you get started with Azure Managed Grafana by creating an Az
6868

6969
1. Once the deployment is complete, select **Go to resource** to open your resource.
7070

71-
1. In the **Overview** tab's Essentials section, select the **Endpoint** URL. Single sign-on via Microsoft Entra ID has been configured for you automatically. If prompted, enter your Azure account.
71+
1. In the **Overview** tab, select the **Endpoint** URL. Single sign-on via Microsoft Entra ID has been configured for you automatically. If prompted, enter your Azure account.
7272

7373
:::image type="content" source="media/quickstart-portal/grafana-overview.png" alt-text="Screenshot of the Azure portal. Endpoint URL display.":::
7474

@@ -77,7 +77,7 @@ In this quickstart, you get started with Azure Managed Grafana by creating an Az
7777
:::image type="content" source="media/quickstart-portal/grafana-ui.png" alt-text="Screenshot of an Azure Managed Grafana workspace.":::
7878

7979
> [!IMPORTANT]
80-
> The **Creator can admin (Preview)** option is designed to be used for testing purposes. Whenever possible, we recommend assgining a [Grafana role](how-to-manage-access-permissions-users-identities.md) to all team members who need to access the Grafana portal and disabling the **Creator can edit** option.
80+
> The **Creator can admin (Preview)** option is designed to be used for testing purposes. Whenever possible, we recommend assigning a [Grafana role](how-to-manage-access-permissions-users-identities.md) to all team members who need to access the Grafana portal and disabling the **Creator can edit** option.
8181

8282
## Clean up resources
8383

0 commit comments

Comments
 (0)