Skip to content

Commit 1f6a41e

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 5c2c174 + fad3aaa commit 1f6a41e

File tree

131 files changed

+790
-4180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+790
-4180
lines changed

.openpublishing.redirection.json

+90
Original file line numberDiff line numberDiff line change
@@ -17351,6 +17351,11 @@
1735117351
"redirect_url": "/azure/monitoring/monitoring-container-insights-overview",
1735217352
"redirect_document_id": false
1735317353
},
17354+
{
17355+
"source_path": "articles/azure-monitor/insights/container-insights-optout-openshift.md",
17356+
"redirect_url": "/azure/azure-monitor/insights/container-insights-optout-openshift-v3",
17357+
"redirect_document_id": false
17358+
},
1735417359
{
1735517360
"source_path": "articles/mobile-engagement/mobile-engagement-send-personalized-notifications.md",
1735617361
"redirect_url": "/azure/azure-resource-manager/management/azure-subscription-service-limits#mobile-engagement-limits",
@@ -51644,6 +51649,91 @@
5164451649
"source_path": "articles/active-directory/develop/active-directory-graph-api-quickstart.md",
5164551650
"redirect_url": "/azure/active-directory/develop/microsoft-graph-intro",
5164651651
"redirect_document_id": false
51652+
},
51653+
{
51654+
"source_path": "articles/jenkins/container-instances-jenkins.md",
51655+
"redirect_url": "/azure/developer/jenkins/azure-container-instances-as-jenkins-build-agent",
51656+
"redirect_document_id": false
51657+
},
51658+
{
51659+
"source_path": "articles/jenkins/tutorial-jenkins-dev-spaces.md",
51660+
"redirect_url": "/azure/developer/jenkins/azure-dev-spaces-and-aks",
51661+
"redirect_document_id": false
51662+
},
51663+
{
51664+
"source_path": "articles/jenkins/storage-java-jenkins-continuous-integration-solution.md",
51665+
"redirect_url": "/azure/developer/jenkins/azure-storage-blobs-as-build-artifact-repository",
51666+
"redirect_document_id": false
51667+
},
51668+
{
51669+
"source_path": "articles/jenkins/install-solution-template-quickstart.md",
51670+
"redirect_url": "/azure/developer/jenkins/configure-on-linux-vm",
51671+
"redirect_document_id": false
51672+
},
51673+
{
51674+
"source_path": "articles/jenkins/install-solution-template-tutorial.md",
51675+
"redirect_url": "/azure/developer/jenkins/configure-on-linux-vm",
51676+
"redirect_document_id": false
51677+
},
51678+
{
51679+
"source_path": "articles/jenkins/jenkins-continuous-deployment.md",
51680+
"redirect_url": "/azure/developer/jenkins/deploy-from-github-to-aks",
51681+
"redirect_document_id": false
51682+
},
51683+
{
51684+
"source_path": "articles/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service.md",
51685+
"redirect_url": "/azure/developer/jenkins/deploy-from-github-to-azure-app-service",
51686+
"redirect_document_id": false
51687+
},
51688+
{
51689+
"source_path": "articles/jenkins/jenkins-aks-blue-green-deployment.md",
51690+
"redirect_url": "/azure/developer/jenkins/deploy-to-aks-using-blue-green-deployment-pattern",
51691+
"redirect_document_id": false
51692+
},
51693+
{
51694+
"source_path": "articles/jenkins/execute-cli-jenkins-pipeline.md",
51695+
"redirect_url": "/azure/developer/jenkins/deploy-to-azure-app-service-using-azure-cli",
51696+
"redirect_document_id": false
51697+
},
51698+
{
51699+
"source_path": "articles/jenkins/deploy-jenkins-app-service-plugin.md",
51700+
"redirect_url": "/azure/developer/jenkins/deploy-to-azure-app-service-using-plugin",
51701+
"redirect_document_id": false
51702+
},
51703+
{
51704+
"source_path": "articles/jenkins/jenkins-azure-functions-deploy.md",
51705+
"redirect_url": "/azure/developer/jenkins/deploy-to-azure-functions",
51706+
"redirect_document_id": false
51707+
},
51708+
{
51709+
"source_path": "articles/jenkins/tutorial-jenkins-deploy-cli-spring-cloud-service.md",
51710+
"redirect_url": "/azure/developer/jenkins/deploy-to-azure-spring-cloud-using-azure-cli",
51711+
"redirect_document_id": false
51712+
},
51713+
{
51714+
"source_path": "articles/jenkins/tutorial-build-deploy-jenkins.md",
51715+
"redirect_url": "/azure/developer/jenkins/deploy-to-linux-vm-using-azure-devops-services",
51716+
"redirect_document_id": false
51717+
},
51718+
{
51719+
"source_path": "articles/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins.md",
51720+
"redirect_url": "/azure/developer/jenkins/deploy-to-service-fabric-cluster",
51721+
"redirect_document_id": false
51722+
},
51723+
{
51724+
"source_path": "articles/jenkins/tutorial-jenkins-github-docker-cicd.md",
51725+
"redirect_url": "/azure/developer/jenkins/pipeline-with-github-and-docker",
51726+
"redirect_document_id": false
51727+
},
51728+
{
51729+
"source_path": "articles/jenkins/jenkins-plugins.md",
51730+
"redirect_url": "/azure/developer/jenkins/plug-ins-for-azure",
51731+
"redirect_document_id": false
51732+
},
51733+
{
51734+
"source_path": "articles/jenkins/jenkins-azure-vm-agents.md",
51735+
"redirect_url": "/azure/developer/jenkins/scale-deployments-using-vm-agents",
51736+
"redirect_document_id": false
5164751737
}
5164851738
]
5164951739
}

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Configure Azure Red Hat OpenShift clusters with Azure Monitor for containers | Microsoft Docs
3-
description: This article describes how to configure monitoring of a Kubernetes cluster with Azure Monitor hosted on Azure Red Hat OpenShift.
2+
title: Configure Azure Red Hat OpenShift v3.x with Azure Monitor for containers | Microsoft Docs
3+
description: This article describes how to configure monitoring of a Kubernetes cluster with Azure Monitor hosted on Azure Red Hat OpenShift version 3 and higher.
44
ms.topic: conceptual
5-
ms.date: 02/12/2020
5+
ms.date: 04/02/2020
66
---
77

8-
# Configure Azure Red Hat OpenShift clusters with Azure Monitor for containers
8+
# Configure Azure Red Hat OpenShift v3 with Azure Monitor for containers
99

10-
Azure Monitor for containers provides rich monitoring experience for the Azure Kubernetes Service (AKS) and AKS Engine clusters. This article describes how to enable monitoring of Kubernetes clusters hosted on [Azure Red Hat OpenShift](../../openshift/intro-openshift.md) to achieve a similar monitoring experience.
10+
Azure Monitor for containers provides rich monitoring experience for the Azure Kubernetes Service (AKS) and AKS Engine clusters. This article describes how to enable monitoring of Kubernetes clusters hosted on [Azure Red Hat OpenShift](../../openshift/intro-openshift.md) version 3 and latest supported version of version 3, to achieve a similar monitoring experience.
1111

1212
>[!NOTE]
1313
>Support for Azure Red Hat OpenShift is a feature in public preview at this time.
@@ -200,4 +200,8 @@ The Log Analytics workspace has to be created before you enable monitoring using
200200
201201
- With monitoring enabled to collect health and resource utilization of your RedHat OpenShift cluster and workloads running on them, learn [how to use](container-insights-analyze.md) Azure Monitor for containers.
202202
203+
- By default, the containerized agent collects the stdout/ stderr container logs of all the containers running in all the namespaces except kube-system. To configure container log collection specific to particular namespace or namespaces, review [Container Insights agent configuration](container-insights-agent-config.md) to configure desired data collection settings to your ConfigMap configurations file.
204+
205+
- To scrape and analyze Prometheus metrics from your cluster, review [Configure Prometheus metrics scraping](container-insights-prometheus-integration.md)
206+
203207
- To learn how to stop monitoring your cluster with Azure Monitor for containers, see [How to Stop Monitoring Your Azure Red Hat OpenShift cluster](container-insights-optout-openshift.md).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
---
2+
title: Configure Azure Red Hat OpenShift v4.x with Azure Monitor for containers | Microsoft Docs
3+
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.
4+
ms.topic: conceptual
5+
ms.date: 04/22/2020
6+
---
7+
8+
# Configure Azure Red Hat OpenShift v4.x with Azure Monitor for containers
9+
10+
Azure Monitor for containers provides rich monitoring experience for the Azure Kubernetes Service (AKS) and AKS Engine clusters. This article describes how to enable monitoring of Kubernetes clusters hosted on [Azure Red Hat OpenShift](../../openshift/intro-openshift.md) version 4.x to achieve a similar monitoring experience.
11+
12+
>[!NOTE]
13+
>Support for Azure Red Hat OpenShift is a feature in public preview at this time.
14+
>
15+
16+
Azure Monitor for containers can be enabled for one or more existing deployments of Azure Red Hat OpenShift v4.x using the following supported methods:
17+
18+
- For an existing cluster using the provided bash script and running in the [Azure CLI](https://docs.microsoft.com/cli/azure/openshift?view=azure-cli-latest#az-openshift-create).
19+
20+
## Supported and unsupported features
21+
22+
Azure Monitor for containers supports monitoring Azure Red Hat OpenShift v4.x as described in the [Overview](container-insights-overview.md) article, except for the following features:
23+
24+
- Live Data (preview)
25+
- [Collect metrics](container-insights-update-metrics.md) from cluster nodes and pods and storing them in the Azure Monitor metrics database
26+
27+
## Prerequisites
28+
29+
- Azure CLI version 2.0.72 or greater
30+
31+
- [Helm 3](https://helm.sh/docs/intro/install/) CLI tool
32+
33+
- [Bash version 4](https://www.gnu.org/software/bash/)
34+
35+
- [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) command-line tool
36+
37+
- 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.
38+
39+
- 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.
40+
41+
## Enable for an existing cluster
42+
43+
Perform the following steps to enable monitoring of an Azure Red Hat OpenShift version 4 and higher cluster deployed in Azure using the provided bash script.
44+
45+
1. Sign into Azure
46+
47+
```azurecli
48+
az login
49+
```
50+
51+
2. Download and save the script to a local folder that configures your cluster with the monitoring add-on using the following commands:
52+
53+
`curl -LO https://raw.githubusercontent.com/microsoft/OMS-docker/ci_feature/docs/aroV4/onboarding_azuremonitor_for_containers.sh.`
54+
55+
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.
56+
57+
### Integrate with an existing workspace
58+
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.
60+
61+
1. List all the subscriptions that you have access to using the following command:
62+
63+
```azurecli
64+
az account list --all -o table
65+
```
66+
67+
The output will resemble the following:
68+
69+
```azurecli
70+
Name CloudName SubscriptionId State IsDefault
71+
------------------------------------ ----------- ------------------------------------ ------- -----------
72+
Microsoft Azure AzureCloud 68627f8c-91fO-4905-z48q-b032a81f8vy0 Enabled True
73+
```
74+
75+
Copy the value for **SubscriptionId**.
76+
77+
2. Switch to the subscription hosting the Log Analytics workspace using the following command:
78+
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.
84+
85+
```
86+
az resource list --resource-type Microsoft.OperationalInsights/workspaces -o json
87+
```
88+
89+
In the output, find the workspace name, and then copy the full resource ID of that Log Analytics workspace under the field **ID**.
90+
91+
4. Run the following command to enable monitoring, replacing the value for the `workspaceResourceId` parameter:
92+
93+
`bash onboarding_azuremonitor_for_containers.sh <kube-context> <azureAroV4ResourceId> <LogAnayticsWorkspaceResourceId>`
94+
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.
100+
101+
### Integrate with default workspace
102+
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>*.
104+
105+
`bash onboarding_azuremonitor_for_containers.sh <kube-context> <azureAroV4ResourceId>`
106+
107+
For example:
108+
109+
`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`
110+
111+
After you've enabled monitoring, it might take about 15 minutes before you can view health metrics for the cluster.
112+
113+
### From the Azure portal
114+
115+
The multi-cluster view in Azure Monitor for containers highlights your Azure Red Hat OpenShift clusters that don't have monitoring enabled under the **Non-monitored clusters** tab. The **Enable** option next to your cluster does not initiate onboarding of monitoring from the portal. You are redirected to this article to manually enable monitoring following the steps earlier in this article.
116+
117+
1. Sign in to the [Azure portal](https://portal.azure.com).
118+
119+
2. On the Azure portal menu or from the Home page, select **Azure Monitor**. Under the **Insights** section, select **Containers**.
120+
121+
3. On the **Monitor - containers** page, select **Non-monitored clusters**.
122+
123+
4. From the list of non-monitored clusters, find the cluster in the list and click **Enable**. You can identify the results in the list by looking for the value **ARO** under the column **CLUSTER TYPE**. After you click **Enable**, you are redirected to this article.
124+
125+
## Next steps
126+
127+
- With monitoring enabled to collect health and resource utilization of your RedHat OpenShift version 4.x cluster and workloads running on them, learn [how to use](container-insights-analyze.md) Azure Monitor for containers.
128+
129+
- By default, the containerized agent collects the stdout/ stderr container logs of all the containers running in all the namespaces except kube-system. To configure container log collection specific to particular namespace or namespaces, review [Container Insights agent configuration](container-insights-agent-config.md) to configure desired data collection settings to your ConfigMap configurations file.
130+
131+
- To scrape and analyze Prometheus metrics from your cluster, review [Configure Prometheus metrics scraping](container-insights-prometheus-integration.md)
132+
133+
- To learn how to stop monitoring your cluster with Azure Monitor for containers, see [How to Stop Monitoring Your Azure Red Hat OpenShift cluster](container-insights-optout-openshift.md).

0 commit comments

Comments
 (0)