Merge pull request #193735 from austonli/patch-18

Changes to disable container monitoring solution

Author: PRMerger17

articles/azure-monitor/agents/agent-linux.md

@@ -176,16 +176,21 @@ The Log Analytics agent for Linux is provided in a self-extracting and installab
 > [!NOTE]
 > For Azure VMs, we recommend you install the agent on them using the [Azure Log Analytics VM extension](../../virtual-machines/extensions/oms-linux.md) for Linux. 
 
+
+
 1. [Download](https://github.com/microsoft/OMS-Agent-for-Linux#azure-install-guide) and transfer the appropriate bundle (x64 or x86) to your Linux VM or physical computer, using scp/sftp.
 
 2. Install the bundle by using the `--install` argument. To onboard to a Log Analytics workspace during installation, provide the `-w <WorkspaceID>` and `-s <workspaceKey>` parameters copied earlier.
 
     >[!NOTE]
     >You need to use the `--upgrade` argument if any dependent packages such as omi, scx, omsconfig or their older versions are installed, as would be the case if the system Center Operations Manager agent for Linux is already installed. 
 
-    ```
-    sudo sh ./omsagent-*.universal.x64.sh --install -w <workspace id> -s <shared key>
-    ```
+> [!NOTE]
+> Because the [Container Monitoring solution](../containers/containers.md) is being retired, the following documentation uses the optional setting --skip-docker-provider-install to disable the Container Monitoring data collection.
+
+   ```
+   sudo sh ./omsagent-*.universal.x64.sh --install -w <workspace id> -s <shared key> --skip-docker-provider-install
+   ```
 
 3. To configure the Linux agent to install and connect to a Log Analytics workspace through a Log Analytics gateway, run the following command providing the proxy, workspace ID, and workspace key parameters. This configuration can be specified on the command line by including `-p [protocol://][user:password@]proxyhost[:port]`. The *proxyhost* property accepts a fully qualified domain name or IP address of the Log Analytics gateway server.  
 
@@ -221,6 +226,10 @@ sudo sh ./omsagent-*.universal.x64.sh --extract
 
 Upgrading from a previous version, starting with version 1.0.0-47, is supported in each release. Perform the installation with the `--upgrade` parameter to upgrade all components of the agent to the latest version.
 
+> [!NOTE]
+> There will be a warning message during the upgrade "docker provider package installation skipped" since --skip-docker-provider-install flag is set. If you are installing over an existing omsagent install and wish to remove the docker provider, you should first purge the existing installation and then install using the --skip-docker-provider-install flag.
+
+
 ## Cache information
 Data from the Log Analytics agent for Linux is cached on the local machine at *%STATE_DIR_WS%/out_oms_common*.buffer* before it's sent to Azure Monitor. Custom log data is buffered in *%STATE_DIR_WS%/out_oms_blob*.buffer*. The path may be different for some [solutions and data types](https://github.com/microsoft/OMS-Agent-for-Linux/search?utf8=%E2%9C%93&q=+buffer_path&type=).
 

articles/azure-monitor/containers/container-insights-overview.md

@@ -62,8 +62,6 @@ You can access Container insights two ways, from Azure Monitor or directly from
 
 ![Overview of methods to access Container insights](./media/container-insights-overview/azmon-containers-experience.png)
 
-If you are interested in monitoring and managing your Docker and Windows container hosts running outside of AKS to view configuration, audit, and resource utilization, see the [Container Monitoring solution](./containers.md).
-
 ## Next steps
 
 To begin monitoring your Kubernetes cluster, review [How to enable Container insights](container-insights-onboard.md) to understand the requirements and available methods to enable monitoring.

articles/virtual-machines/extensions/oms-linux.md

@@ -64,6 +64,9 @@ The Log Analytics agent extension for Linux requires that the target virtual mac
 ## Extension schema
 
 The following JSON shows the schema for the Log Analytics agent extension. The extension requires the workspace ID and workspace key from the target Log Analytics workspace; these values can be [found in your Log Analytics workspace](../../azure-monitor/vm/monitor-virtual-machine.md) in the Azure portal. Because the workspace key should be treated as sensitive data, it should be stored in a protected setting configuration. Azure VM extension protected setting data is encrypted, and only decrypted on the target virtual machine. Note that **workspaceId** and **workspaceKey** are case-sensitive.
+> [!NOTE]
+> Because the [Container Monitoring solution](../../azure-monitor/containers/containers.md) is being retired, the following documentation uses the optional setting "skipDockerProviderInstall": true.
+
 
 ```json
 {
@@ -80,7 +83,8 @@ The following JSON shows the schema for the Log Analytics agent extension. The e
     "typeHandlerVersion": "1.13",
     "autoUpgradeMinorVersion": true,
     "settings": {
-      "workspaceId": "myWorkspaceId"
+      "workspaceId": "myWorkspaceId",
+      "skipDockerProviderInstall": true
     },
     "protectedSettings": {
       "workspaceKey": "myWorkSpaceKey"
@@ -128,7 +132,8 @@ The following example assumes the VM extension is nested inside the virtual mach
     "type": "OmsAgentForLinux",
     "typeHandlerVersion": "1.13",
     "settings": {
-      "workspaceId": "myWorkspaceId"
+      "workspaceId": "myWorkspaceId",
+      "skipDockerProviderInstall": true
     },
     "protectedSettings": {
       "workspaceKey": "myWorkSpaceKey"
@@ -153,7 +158,8 @@ When placing the extension JSON at the root of the template, the resource name i
     "type": "OmsAgentForLinux",
     "typeHandlerVersion": "1.13",
     "settings": {
-      "workspaceId": "myWorkspaceId"
+      "workspaceId": "myWorkspaceId",
+      "skipDockerProviderInstall": true
     },
     "protectedSettings": {
       "workspaceKey": "myWorkSpaceKey"
@@ -173,7 +179,7 @@ az vm extension set \
   --name OmsAgentForLinux \
   --publisher Microsoft.EnterpriseCloud.Monitoring \
   --protected-settings '{"workspaceKey":"myWorkspaceKey"}' \
-  --settings '{"workspaceId":"myWorkspaceId"}'
+  --settings '{"workspaceId":"myWorkspaceId","skipDockerProviderInstall": true}'
 ```
 
 ## Troubleshoot and support