fixing blocking issues

rashmichandrashekar · rashmichandrashekar · commit 99219c299f3e · 2024-04-01T14:05:30.000-07:00
diff --git a/articles/azure-monitor/containers/prometheus-argocd-integration.md b/articles/azure-monitor/containers/prometheus-argocd-integration.md
@@ -1,9 +1,10 @@
 ---
 title: Configure argocd integration for Prometheus metrics in Azure Monitor
-description: Describes how to configure argocd monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
+description: Describes how to configure Argo CD monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
 ms.topic: conceptual
 ms.date: 3/25/2024
 ms.reviewer: rashmy
+ms.service: managed-prometheus
 ---
 # Argo CD
 Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. Argo CD follows the GitOps pattern of using Git repositories as the source of truth for defining the desired application state. It automates the deployment of the desired application states in the specified target environments. Application deployments can track updates to branches, tags, or pinned to a specific version of manifests at a Git commit.
@@ -15,7 +16,7 @@ This article describes how to configure Azure Managed Prometheus with Azure Kube
 + Azure Managed prometheus enabled on the AKS cluster - [Enable Azure Managed Prometheus on AKS](kubernetes-monitoring-enable.md#enable-prometheus-and-grafana)
 
 ### Deploy Service Monitors
-Deploy the following service monitors to configure azure managed prometheus addon to scrape prometheus metrics from the argocd workload.
+Deploy the following service monitors to configure Azure managed prometheus addon to scrape prometheus metrics from the argocd workload.
 
 > [!NOTE] 
 > Please specify the right labels in the matchLabels for the service monitors if they do not match the configured ones in the sample.
@@ -92,13 +93,16 @@ spec:
 
 3. Deploy the template by using any standard methods for installing ARM templates. For guidance, see [ARM template samples for Azure Monitor](../resource-manager-samples.md).
 
-4. Once deployed, you can view the rules in the Azure Portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
+4. Once deployed, you can view the rules in the Azure portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
 
 > [!Note] 
-> 1. Review the alert thresholds to make sure it suits your cluster/worklaods and update it accordingly.</br>
-> 2. Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.</br>
-> 3. Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).</br>
-> 4. If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
+> Review the alert thresholds to make sure it suits your cluster/workloads and update it accordingly.
+>
+> Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.
+>
+> Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).
+>
+> If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
 
 
 ### Import the Grafana Dashboard
diff --git a/articles/azure-monitor/containers/prometheus-elasticsearch-integration.md b/articles/azure-monitor/containers/prometheus-elasticsearch-integration.md
@@ -1,9 +1,10 @@
 ---
 title: Configure elastic search integration for Prometheus metrics in Azure Monitor
-description: Describes how to configure elastic search monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
+description: Describes how to configure ElasticSearch monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
 ms.topic: conceptual
 ms.date: 3/19/2024
 ms.reviewer: rashmy
+ms.service: managed-prometheus
 ---
 # ElasticSearch
 Elasticsearch is the distributed search and analytics engine at the heart of the Elastic Stack. It is where the indexing, search, and analysis magic happen.
@@ -15,19 +16,22 @@ This article describes how to configure Azure Managed Prometheus with Azure Kube
 + Azure Managed prometheus enabled on the AKS cluster - [Enable Azure Managed Prometheus on AKS](kubernetes-monitoring-enable.md#enable-prometheus-and-grafana)
 
 
-### Install Elastic Search Exporter -
+### Install Elastic Search Exporter
 Install the [elastic search exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter) using the helm chart -
 
 ```bash
 helm install azmon-elasticsearch-exporter --version 5.7.0 prometheus-community/prometheus-elasticsearch-exporter --set es.uri="https://username:password@elasticsearch-service.namespace:9200" --set podMonitor.enabled=true --set podMonitor.apiVersion=azmonitoring.coreos.com/v1
 ```
 
 > [!NOTE] 
-> 1. Managed prometheus pod/service monitor configuration with helm chart installation is only supported with the helm chart version >=5.7.0.</br>
-> 2. The [prometheus-elasticsearch-exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter) helm chart can be configured with [values](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml) yaml.
-Please specify the right server address where the elasticsearch server can be reached. Based on your configuration set the username,password or certs used to authenticate with the elasticsearch server. Set the address where elasticsearch is reachable using the argument "es.uri" ex - .</br>
-> 3. You could also use service monitor, instead of pod monitor by using the **--set serviceMonitor.enabled=true** helm chart paramaters. Make sure to use the api version supported by Azure Managed Prometheus using the parameter **serviceMonitor.apiVersion=azmonitoring.coreos.com/v1**.</br>
-> 4. If you want to configure any other service or pod monitors, please follow the instructions [here](prometheus-metrics-scrape-crd.md#create-a-pod-or-service-monitor).
+> Managed prometheus pod/service monitor configuration with helm chart installation is only supported with the helm chart version >=5.7.0.
+>
+> The [prometheus-elasticsearch-exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter) helm chart can be configured with [values](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml) yaml.
+Please specify the right server address where the ElasticSearch server can be reached. Based on your configuration set the username,password or certs used to authenticate with the ElasticSearch server. Set the address where ElasticSearch is reachable using the argument "es.uri" ex - .
+>
+> You could also use service monitor, instead of pod monitor by using the **--set serviceMonitor.enabled=true** helm chart paramaters. Make sure to use the api version supported by Azure Managed Prometheus using the parameter **serviceMonitor.apiVersion=azmonitoring.coreos.com/v1**.
+>
+> If you want to configure any other service or pod monitors, please follow the instructions [here](prometheus-metrics-scrape-crd.md#create-a-pod-or-service-monitor).
 
 
 ### Deploy Rules
@@ -53,13 +57,16 @@ Please specify the right server address where the elasticsearch server can be re
 
 3. Deploy the template by using any standard methods for installing ARM templates. For guidance, see [ARM template samples for Azure Monitor](../resource-manager-samples.md).
 
-4. Once deployed, you can view the rules in the Azure Portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
+4. Once deployed, you can view the rules in the Azure portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
 
 > [!Note] 
-> 1. Review the alert thresholds to make sure it suits your cluster/worklaods and update it accordingly.</br>
-> 2. Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.</br>
-> 3. Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).</br>
-> 4. If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
+> Review the alert thresholds to make sure it suits your cluster/worklaods and update it accordingly.
+>
+> Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.
+>
+> Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).
+>
+> If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
 
 ### Import the Grafana Dashboard
 
diff --git a/articles/azure-monitor/containers/prometheus-kafka-integration.md b/articles/azure-monitor/containers/prometheus-kafka-integration.md
@@ -1,9 +1,10 @@
 ---
-title: Configure kafka integration for Prometheus metrics in Azure Monitor
-description: Describes how to configure kafka monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
+title: Configure Kafka integration for Prometheus metrics in Azure Monitor
+description: Describes how to configure kKfka monitoring using Prometheus metrics in Azure Monitor to Kubernetes cluster.
 ms.topic: conceptual
 ms.date: 3/19/2024
 ms.reviewer: rashmy
+ms.service: managed-prometheus
 ---
 # Apache Kafka
 Apache Kafka is an open-source distributed event streaming platform used by high-performance data pipelines, streaming analytics, data integration, and mission-critical applications.
@@ -15,25 +16,27 @@ This article describes how to configure Azure Managed Prometheus with Azure Kube
 + Azure Managed prometheus enabled on the AKS cluster - [Enable Azure Managed Prometheus on AKS](kubernetes-monitoring-enable.md#enable-prometheus-and-grafana)
 
 
-### Install Kafka Exporter -
-Install the [kafka exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter) using the helm chart -
+### Install Kafka Exporter
+Install the [Kafka Exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter) using the helm chart -
 
 ```bash
 helm install azmon-kafka-exporter --namespace=azmon-kafka-exporter --create-namespace --version 2.10.0 prometheus-community/prometheus-kafka-exporter --set kafkaServer="{kafka-server.namespace.svc:9092,.....}" --set prometheus.serviceMonitor.enabled=true --set prometheus.serviceMonitor.apiVersion=azmonitoring.coreos.com/v1
 ```
 
 > [!NOTE] 
-> 1. Managed prometheus pod/service monitor configuration with helm chart installation is only supported with the helm chart version >=2.10.0.</br>
-> 2. The [prometheus kafka exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter) helm chart can be configured with [values](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-kafka-exporter/values.yaml) yaml.
-Please specify the right server addresses where the kafka servers can be reached. Set the server address(es) using the argument "kafkaServer".</br>
-> 3. If you want to configure any other service or pod monitors, please follow the instructions [here](prometheus-metrics-scrape-crd.md#create-a-pod-or-service-monitor).
+> Managed prometheus pod/service monitor configuration with helm chart installation is only supported with the helm chart version >=2.10.0.
+>
+> The [prometheus kafka exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter) helm chart can be configured with [values](https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-kafka-exporter/values.yaml) yaml.
+Please specify the right server addresses where the kafka servers can be reached. Set the server address(es) using the argument "kafkaServer".
+>
+> If you want to configure any other service or pod monitors, please follow the instructions [here](prometheus-metrics-scrape-crd.md#create-a-pod-or-service-monitor).
 
 
 ### Import the Grafana Dashboard
 
-To import the grafana dashboards using the ID or JSON, follow the instructions to [Import a dashboard from Grafana Labs](../../managed-grafana/how-to-create-dashboard.md#import-a-grafana-dashboard). </br>
+To import the Grafana Dashboards using the ID or JSON, follow the instructions to [Import a dashboard from Grafana Labs](../../managed-grafana/how-to-create-dashboard.md#import-a-grafana-dashboard). </br>
 
-[kafka_exporter grafana dashboard](https://grafana.com/grafana/dashboards/7589-kafka-exporter-overview/)(ID-7589)
+[Kafka Exporter Grafana Dashboard](https://grafana.com/grafana/dashboards/7589-kafka-exporter-overview/)(ID-7589)
 
 ### Deploy Rules
 1. Download the template and parameter files
@@ -54,19 +57,24 @@ To import the grafana dashboards using the ID or JSON, follow the instructions t
 
 3. Deploy the template by using any standard methods for installing ARM templates. For guidance, see [ARM template samples for Azure Monitor](../resource-manager-samples.md).
 
-4. Once deployed, you can view the rules in the Azure Portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
+4. Once deployed, you can view the rules in the Azure portal as described in - [Prometheus Alerts](../essentials/prometheus-rule-groups.md#view-prometheus-rule-groups)
 
 > [!Note] 
-> 1. Review the alert thresholds to make sure it suits your cluster/worklaods and update it accordingly.</br>
-> 2. Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.</br>
-> 3. Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).</br>
-> 4. If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
+> Review the alert thresholds to make sure it suits your cluster/workloads and update it accordingly.
+>
+> Please note that the above rules are not scoped to a cluster. If you would like to scope the rules to a specific cluster, see [Limiting rules to a specific cluster](../essentials/prometheus-rule-groups.md#limiting-rules-to-a-specific-cluster) for more details.
+>
+> Learn more about [Prometheus Alerts](../essentials/prometheus-rule-groups.md).
+>
+> If you want to use any other OSS prometheus alerting/recording rules please use the converter here to create the azure equivalent prometheus rules [az-prom-rules-converter](https://aka.ms/az-prom-rules-converter)
 
 
 ### More jmx_exporter metrics using strimzi
 If you are using the [strimzi operator](https://github.com/strimzi/strimzi-kafka-operator.git) for deploying the kafka clusters, deploy the pod monitors to get more jmx_exporter metrics.
-Note that the metrics need to exposed by the kafka cluster deployments like the examples [here](https://github.com/strimzi/strimzi-kafka-operator/tree/main/examples/metrics). Refer to the kafka-.*-metrics.yaml files to configure metrics to be exposed. 
-The pod monitors here also assume that the namespace where the kafka workload is deployed in 'kafka'. Update it accordingly if the workloads are deployed in another namespace.
+> [!Note] 
+> Metrics need to be exposed by the kafka cluster deployments like the examples [here](https://github.com/strimzi/strimzi-kafka-operator/tree/main/examples/metrics). Refer to the kafka-.*-metrics.yaml files to configure metrics to be exposed. 
+>
+>The pod monitors here also assume that the namespace where the kafka workload is deployed in 'kafka'. Update it accordingly if the workloads are deployed in another namespace.
 
 ```yaml
 apiVersion: azmonitoring.coreos.com/v1
@@ -175,7 +183,7 @@ Rich set of alerts based off of strimzi metrics can also be configured by referi
 > [!NOTE] 
 > If using any other way of exposing the jmx_exporter on your kafka cluster, please follow the instructions [here](prometheus-metrics-scrape-crd.md) on how to configure the pod or service monitors accordingly.
 
-### Grafana dashboards for more jmx metrics
+### Grafana dashboards for more jmx metrics witb strimzi
 Please also see the [grafana-dashboards-for-strimzi](https://github.com/strimzi/strimzi-kafka-operator/tree/main/examples/metrics/grafana-dashboards) to view dashboards for metrics exposed by strimzi operator.
 
 
