Merge pull request #102106 from MGoedtel/CILinkFix123

updated k8s agent manage article

Author: megvanhuygen

articles/azure-monitor/insights/container-insights-health.md

@@ -18,7 +18,7 @@ For information about how to enable Azure Monitor for containers, see [Onboard A
 >[!NOTE]
 >To support AKS Engine clusters, verify it meets the following:
 >- It is using the latest version of the [HELM client](https://helm.sh/docs/using_helm/).
->- The containerized agent version is *microsoft/oms:ciprod11012019*. To upgrade the agent, see [upgrading agent on Kubernetes cluster](container-insights-manage-agent.md#upgrading-agent-on-monitored-kubernetes-cluster).
+>- The containerized agent version is *microsoft/oms:ciprod11012019*. To upgrade the agent, see [upgrading agent on Kubernetes cluster](container-insights-manage-agent.md#upgrade-agent-on-monitored-kubernetes-cluster).
 >
 
 ## Overview

articles/azure-monitor/insights/container-insights-manage-agent.md

@@ -2,7 +2,7 @@
 title: How to manage the Azure Monitor for containers agent | Microsoft Docs
 description: This article describes managing the most common maintenance tasks with the containerized Log Analytics agent used by Azure Monitor for containers.
 ms.topic: conceptual
-ms.date: 01/13/2020
+ms.date: 01/24/2020
 
 ---
 
@@ -12,13 +12,13 @@ Azure Monitor for containers uses a containerized version of the Log Analytics a
 
 ## How to upgrade the Azure Monitor for containers agent
 
-Azure Monitor for containers uses a containerized version of the Log Analytics agent for Linux. When a new version of the agent is released, the agent is automatically upgraded on your managed Kubernetes clusters hosted on Azure Kubernetes Service (AKS).  
+Azure Monitor for containers uses a containerized version of the Log Analytics agent for Linux. When a new version of the agent is released, the agent is automatically upgraded on your managed Kubernetes clusters hosted on Azure Kubernetes Service (AKS) and Azure Red Hat OpenShift. For a [hybrid Kubernetes cluster](container-insights-hybrid-setup.md) the agent is not managed, and you need to manually upgrade the agent.
 
-If the agent upgrade fails, this article describes the process to manually upgrade the agent. To follow the versions released, see [agent release announcements](https://github.com/microsoft/docker-provider/tree/ci_feature_prod).   
+If the agent upgrade fails for a cluster hosted on AKS, this article also describes the process to manually upgrade the agent. To follow the versions released, see [agent release announcements](https://github.com/microsoft/docker-provider/tree/ci_feature_prod).
 
-### Upgrading agent on monitored Kubernetes cluster
+### Upgrade agent on monitored Kubernetes cluster
 
-The process to upgrade the agent on clusters, other than Azure Red Hat OpenShift, consists of two straight forward steps. The first step is to disable monitoring with Azure Monitor for containers using Azure CLI.  Follow the steps described in the [Disable monitoring](container-insights-optout.md?#azure-cli) article. Using Azure CLI allows us to remove the agent from the nodes in the cluster without impacting the solution and the corresponding data that is stored in the workspace. 
+The process to upgrade the agent on clusters, other than Azure Red Hat OpenShift, consists of two straight forward steps. The first step is to disable monitoring with Azure Monitor for containers using Azure CLI. Follow the steps described in the [Disable monitoring](container-insights-optout.md?#azure-cli) article. Using Azure CLI allows us to remove the agent from the nodes in the cluster without impacting the solution and the corresponding data that is stored in the workspace. 
 
 >[!NOTE]
 >While you are performing this maintenance activity, the nodes in the cluster are not forwarding collected data, and performance views will not show data between the time you remove the agent and install the new version. 
@@ -49,6 +49,29 @@ The status should resemble the following example, where the value for *omi* and
 	omsagent 1.6.0-163
 	docker-cimprov 1.0.0.31
 
+## Upgrade agent on hybrid Kubernetes cluster
+
+The process to upgrade the agent on a Kubernetes cluster hosted on-premises, AKS Engine on Azure and Azure Stack can be completed by running the following command:
+
+```
+$ helm upgrade --name myrelease-1 \
+--set omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<my_prod_cluster> incubator/azuremonitor-containers
+```
+
+If the Log Analytics workspace is in Azure China, run the following command:
+
+```
+$ helm upgrade --name myrelease-1 \
+--set omsagent.domain=opinsights.azure.cn,omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<your_cluster_name> incubator/azuremonitor-containers
+```
+
+If the Log Analytics workspace is in Azure US Government, run the following command:
+
+```
+$ helm upgrade --name myrelease-1 \
+--set omsagent.domain=opinsights.azure.us,omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<your_cluster_name> incubator/azuremonitor-containers
+```
+
 ## How to disable environment variable collection on a container
 
 Azure Monitor for containers collects environmental variables from the containers running in a pod and presents them in the property pane of the selected container in the **Containers** view. You can control this behavior by disabling collection for a specific container either during deployment of the Kubernetes cluster, or after by setting the environment variable *AZMON_COLLECT_ENV*. This feature is available from the agent version – ciprod11292018 and higher.