Skip to content

Commit b4b9e39

Browse files
committed
updated articles per Eng feedback
1 parent f77b864 commit b4b9e39

File tree

3 files changed

+41
-36
lines changed

3 files changed

+41
-36
lines changed

articles/azure-monitor/insights/container-insights-azure-redhat4-setup.md

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Red Hat OpenShift v4.x with Azure Monitor for containers | Microsoft Docs
33
description: This article describes how to configure monitoring of a Kubernetes cluster with Azure Monitor hosted on Azure Red Hat OpenShift version 4 and higher.
44
ms.topic: conceptual
5-
ms.date: 04/16/2020
5+
ms.date: 04/22/2020
66
---
77

88
# Configure Azure Red Hat OpenShift v4.x with Azure Monitor for containers
@@ -26,10 +26,14 @@ Azure Monitor for containers supports monitoring Azure Red Hat OpenShift v4.x as
2626

2727
## Prerequisites
2828

29+
- Azure CLI version 2.0.72 or greater
30+
2931
- [Helm 3](https://helm.sh/docs/intro/install/) CLI tool
3032

3133
- [Bash version 4](https://www.gnu.org/software/bash/)
3234

35+
- [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) command-line tool
36+
3337
- To enable and access the features in Azure Monitor for containers, at a minimum you need to be a member of the Azure *Contributor* role in the Azure subscription, and a member of the [*Log Analytics Contributor*](../platform/manage-access.md#manage-access-using-azure-permissions) role of the Log Analytics workspace configured with Azure Monitor for containers.
3438

3539
- To view the monitoring data, you are a member of the [*Log Analytics reader*](../platform/manage-access.md#manage-access-using-azure-permissions) role permission with the Log Analytics workspace configured with Azure Monitor for containers.
@@ -48,50 +52,55 @@ Perform the following steps to enable monitoring of an Azure Red Hat OpenShift v
4852
4953
`curl -LO https://raw.githubusercontent.com/microsoft/OMS-docker/ci_feature/docs/aroV4/onboarding_azuremonitor_for_containers.sh.`
5054
51-
5255
3. To identify the **kube-context** of your cluster, after successful `oc login` on to your cluster, run the command `kubectl config current-context` and copy the value.
5356
54-
4. The following step enables monitoring of your cluster using the bash script you downloaded earlier. To integrate with an existing Log Analytics workspace, perform the following steps to first identify the full resource ID of your Log Analytics workspace required for the `workspaceResourceId` parameter, and then run the command to enable the monitoring add-on against the specified workspace. If you don't have a workspace to specify, you can skip to step 5 and let the script create a new workspace for you.
57+
### Integrate with an existing workspace
5558
56-
1. List all the subscriptions that you have access to using the following command:
59+
The following step enables monitoring of your cluster using the bash script you downloaded earlier. To integrate with an existing Log Analytics workspace, perform the following steps to first identify the full resource ID of your Log Analytics workspace required for the `workspaceResourceId` parameter, and then run the command to enable the monitoring add-on against the specified workspace. If you don't have a workspace to specify, you can skip to step 5 and let the script create a new workspace for you.
5760
58-
```azurecli
59-
az account list --all -o table
60-
```
61+
1. List all the subscriptions that you have access to using the following command:
6162
62-
The output will resemble the following:
63+
```azurecli
64+
az account list --all -o table
65+
```
6366
64-
```azurecli
65-
Name CloudName SubscriptionId State IsDefault
66-
------------------------------------ ----------- ------------------------------------ ------- -----------
67-
Microsoft Azure AzureCloud 68627f8c-91fO-4905-z48q-b032a81f8vy0 Enabled True
68-
```
67+
The output will resemble the following:
6968
70-
Copy the value for **SubscriptionId**.
69+
```azurecli
70+
Name CloudName SubscriptionId State IsDefault
71+
------------------------------------ ----------- ------------------------------------ ------- -----------
72+
Microsoft Azure AzureCloud 68627f8c-91fO-4905-z48q-b032a81f8vy0 Enabled True
73+
```
7174
72-
2. Switch to the subscription hosting the Log Analytics workspace using the following command:
75+
Copy the value for **SubscriptionId**.
7376
74-
```azurecli
75-
az account set -s <subscriptionId of the workspace>
76-
```
77+
2. Switch to the subscription hosting the Log Analytics workspace using the following command:
7778
78-
3. The following example displays the list of workspaces in your subscriptions in the default JSON format.
79+
```azurecli
80+
az account set -s <subscriptionId of the workspace>
81+
```
82+
83+
3. The following example displays the list of workspaces in your subscriptions in the default JSON format.
7984
80-
```
81-
az resource list --resource-type Microsoft.OperationalInsights/workspaces -o json
82-
```
85+
```
86+
az resource list --resource-type Microsoft.OperationalInsights/workspaces -o json
87+
```
8388
84-
In the output, find the workspace name, and then copy the full resource ID of that Log Analytics workspace under the field **ID**.
89+
In the output, find the workspace name, and then copy the full resource ID of that Log Analytics workspace under the field **ID**.
8590
86-
4. Run the following command to enable monitoring, replacing the value for the `workspaceResourceId` parameter:
91+
4. Run the following command to enable monitoring, replacing the value for the `workspaceResourceId` parameter:
8792
88-
`bash onboarding_azuremonitor_for_containers.sh <kube-context> <azureAroV4ResourceId> <LogAnayticsWorkspaceResourceId>`
93+
`bash onboarding_azuremonitor_for_containers.sh <kube-context> <azureAroV4ResourceId> <LogAnayticsWorkspaceResourceId>`
8994
90-
Example:
95+
Example:
96+
97+
`bash onboarding_azuremonitor_for_containers.sh MyK8sTestCluster /subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/resourceGroups/test-aro-v4-rg/providers/Microsoft.RedHatOpenShift/OpenShiftClusters/test-aro-v4 /subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/resourcegroups/test-la-workspace-rg/providers/microsoft.operationalinsights/workspaces/test-la-workspace`
98+
99+
After you've enabled monitoring, it might take about 15 minutes before you can view health metrics for the cluster.
91100
92-
`bash onboarding_azuremonitor_for_containers.sh MyK8sTestCluster /subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/resourceGroups/test-aro-v4-rg/providers/Microsoft.RedHatOpenShift/OpenShiftClusters/test-aro-v4 /subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/resourcegroups/test-la-workspace-rg/providers/microsoft.operationalinsights/workspaces/test-la-workspace`
101+
### Integrate with default workspace
93102
94-
5. The following step enables monitoring of your Azure Red Hat OpenShift v4.x cluster using the bash script you downloaded. In this example, you are not required to per-create or specify an existing workspace. This command simplifies the process for you by creating a default workspace in the default resource group of the cluster subscription if one does not already exist in the region. The default workspace created resembles the format of *DefaultWorkspace-\<GUID>-\<Region>*.
103+
The following step enables monitoring of your Azure Red Hat OpenShift v4.x cluster using the bash script you downloaded. In this example, you are not required to per-create or specify an existing workspace. This command simplifies the process for you by creating a default workspace in the default resource group of the cluster subscription if one does not already exist in the region. The default workspace created resembles the format of *DefaultWorkspace-\<GUID>-\<Region>*.
95104
96105
`bash onboarding_azuremonitor_for_containers.sh <kube-context> <azureAroV4ResourceId>`
97106

articles/azure-monitor/insights/container-insights-hybrid-setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Hybrid Kubernetes clusters with Azure Monitor for containers | Microsoft Docs
33
description: This article describes how you can configure Azure Monitor for containers to monitor Kubernetes clusters hosted on Azure Stack or other environment.
44
ms.topic: conceptual
5-
ms.date: 04/17/2020
5+
ms.date: 04/22/2020
66
---
77

88
# Configure hybrid Kubernetes clusters with Azure Monitor for containers
@@ -23,7 +23,7 @@ The following is officially supported with Azure Monitor for containers.
2323

2424
* Versions of Kubernetes and support policy are the same as versions of [AKS supported](../../aks/supported-kubernetes-versions.md).
2525

26-
* Container Runtime: Docker, Moby, and CRI-O
26+
* Container Runtime: Docker, Moby, and CRI compatible runtimes such CRI-O and ContainerD.
2727

2828
* Linux OS release for master and worked nodes: Ubuntu (18.04 LTS and 16.04 LTS), and Red Hat Enterprise Linux CoreOS 43.81.
2929

articles/azure-monitor/insights/container-insights-prometheus-integration.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Monitor for containers Prometheus Integration | Microsoft Docs
33
description: This article describes how you can configure the Azure Monitor for containers agent to scrape metrics from Prometheus with your Kubernetes cluster.
44
ms.topic: conceptual
5-
ms.date: 04/21/2020
5+
ms.date: 04/22/2020
66
---
77

88
# Configure scraping of Prometheus metrics with Azure Monitor for containers
@@ -24,10 +24,6 @@ Scraping of Prometheus metrics is supported with Kubernetes clusters hosted on:
2424
- Azure Red Hat OpenShift version 3.x
2525
- Azure Red Hat OpenShift and Red Hat OpenShift version 4.x
2626

27-
28-
29-
30-
>
3127
### Prometheus scraping settings
3228

3329
Active scraping of metrics from Prometheus is performed from one of two perspectives:
@@ -66,7 +62,7 @@ Perform the following steps to configure your ConfigMap configuration file for t
6662

6763
* Azure Kubernetes Service (AKS)
6864
* Azure Stack or on-premises
69-
* Azure Red Hat OpenShift version 4.x
65+
* Azure Red Hat OpenShift version 4.x and Red Hat OpenShift version 4.x
7066

7167
1. [Download](https://github.com/microsoft/OMS-docker/blob/ci_feature_prod/Kubernetes/container-azm-ms-agentconfig.yaml) the template ConfigMap yaml file and save it as container-azm-ms-agentconfig.yaml.
7268

0 commit comments

Comments
 (0)