Skip to content

Commit 68b312c

Browse files
Merge pull request #248603 from JnHs/jh-arck8-0817cu
small cleanup fixes
2 parents 129eed5 + 9debca4 commit 68b312c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

articles/azure-arc/kubernetes/monitor-gitops-flux-2.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Monitor GitOps (Flux v2) status and activity
3-
ms.date: 08/11/2023
3+
ms.date: 08/17/2023
44
ms.topic: how-to
55
description: Learn how to monitor status, compliance, resource consumption, and reconciliation activity for GitOps with Flux v2.
66
---
@@ -24,18 +24,18 @@ Follow these steps to import dashboards that let you monitor Flux extension depl
2424
> [!NOTE]
2525
> These steps describe the process for importing the dashboard to [Azure Managed Grafana](/azure/managed-grafana/overview). You can also [import this dashboard to any Grafana instance](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard). With this option, a service principal must be used; managed identity is not supported for data connection outside of Azure Managed Grafana.
2626
27-
1. Create an Azure Managed Grafana instance by using the [Azure portal](/azure/managed-grafana/quickstart-managed-grafana-portal) or [Azure CLI](/azure/managed-grafana/quickstart-managed-grafana-cli). Ensure that you're able to access Grafana by selecting its endpoint on the Overview page. You need at least **Reader** level permissions. You can check your access by going to **Access control (IAM)** on the Grafana instance.
28-
1. If you're using a managed identity for the Azure Managed Grafana instance, follow these steps to assign it a Reader role on the subscription(s):
27+
1. Create an Azure Managed Grafana instance by using the [Azure portal](/azure/managed-grafana/quickstart-managed-grafana-portal) or [Azure CLI](/azure/managed-grafana/quickstart-managed-grafana-cli). Ensure that you're able to access Grafana by selecting its endpoint on the Overview page. You need at least [Monitoring Reader](/azure/azure-monitor/roles-permissions-security) level permissions. You can check your access by going to **Access control (IAM)** on the Grafana instance.
28+
1. If you're using a managed identity for the Azure Managed Grafana instance, follow these steps to assign it the **Monitoring Reader** role on the subscription(s):
2929

3030
1. In the Azure portal, navigate to the subscription that you want to add.
3131
1. Select **Access control (IAM)**.
3232
1. Select **Add role assignment**.
33-
1. Select the **Reader** role, then select **Next**.
33+
1. Select the **Monitoring Reader** role, then select **Next**.
3434
1. On the **Members** tab, select **Managed identity**, then choose **Select members**.
3535
1. From the **Managed identity** list, select the subscription where you created your Azure Managed Grafana Instance. Then select **Azure Managed Grafana** and the name of your Azure Managed Grafana instance.
3636
1. Select **Review + Assign**.
3737

38-
If you're using a service principal, grant the **Reader** role to the service principal that you'll use for your data source connection. Follow these same steps, but select **User, group, or service principal** in the **Members** tab, then select your service principal. (If you aren't using Azure Managed Grafana, you must use a service principal for data connection access.)
38+
If you're using a service principal, grant the **Monitoring Reader** role to the service principal that you'll use for your data source connection. Follow these same steps, but select **User, group, or service principal** in the **Members** tab, then select your service principal. (If you aren't using Azure Managed Grafana, you must use a service principal for data connection access.)
3939

4040
1. [Create the Azure Monitor Data Source connection](https://grafana.com/docs/grafana/latest/datasources/azure-monitor/) in your Azure Managed Grafana instance. This connection lets the dashboard access Azure Resource Graph data.
4141
1. Download the [GitOps Flux - Application Deployments Dashboard](https://github.com/Azure/fluxv2-grafana-dashboards/blob/main/dashboards/GitOps%20Flux%20-%20Application%20Deployments%20Dashboard.json).

articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,6 @@ az k8s-extension update --resource-group <resource-group> --cluster-name <cluste
567567

568568
If you don't specify values for `memoryThreshold` and `outOfMemoryWatch`, the default memory threshold is set to 95%, with the interval at which to check the memory utilization set to 500 ms.
569569

570-
571-
572570
## Delete the Flux configuration and extension
573571

574572
Use the following commands to delete your Flux configuration and, if desired, the Flux extension itself.
@@ -616,6 +614,8 @@ For AKS clusters, you can't use the Azure portal to delete the extension. Instea
616614
az k8s-extension delete -g <resource-group> -c <cluster-name> -n flux -t managedClusters --yes
617615
```
618616

617+
---
618+
619619
## Next steps
620620

621621
* Read more about [configurations and GitOps](conceptual-gitops-flux2.md).

0 commit comments

Comments
 (0)