From 333bdfb086f70f4e8c3fe6f1c239418d6ff1e653 Mon Sep 17 00:00:00 2001
From: Vishwanath <visnara@microsoft.com>
Date: Wed, 8 Aug 2018 20:34:38 -0700
Subject: [PATCH] [incubator/azuremonitor-containers] Fix typos in readme &
 notes (#6748)

* Added 'azuremonitor-containers' chart in incubator

* removing blank lines that failed tests

* Text changes in readme file

* adding OWNERS file

* Fix PR comments

* fix trailing space

* fixing some typos in readme & notes.

* bumping version

* Updating to latest agent and fixing readme
---
 incubator/azuremonitor-containers/Chart.yaml          | 2 +-
 incubator/azuremonitor-containers/README.md           | 6 +++---
 incubator/azuremonitor-containers/templates/NOTES.txt | 4 ++--
 incubator/azuremonitor-containers/values.yaml         | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
index 6b558678f9..6aacace719 100644
--- a/incubator/azuremonitor-containers/Chart.yaml
+++ b/incubator/azuremonitor-containers/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 2.0.0-3
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 0.1.0
+version: 0.2.0
 keywords:
   - monitoring
   - azuremonitor
diff --git a/incubator/azuremonitor-containers/README.md b/incubator/azuremonitor-containers/README.md
index a093bfdbc0..5fbb01703e 100644
--- a/incubator/azuremonitor-containers/README.md
+++ b/incubator/azuremonitor-containers/README.md
@@ -4,7 +4,7 @@
 
 ## Introduction
 
-This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health)) to monitor the health and performance of your workloads deployed to Kubernetes environments. Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
+This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments. Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
 
 *This is a private preview. If you like to be part of the private preview, please fill in the form* [here]((https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR5SUgbotTSlNh-jO0uLfw51UOVBTMzFCMVIyWVEzT09NWVpDOTc0UFhENC4u)).
 
@@ -27,7 +27,7 @@ This article describes how to set up and use [Azure Monitor - Containers](https:
 ## Installing the Chart
 
 ```bash
-
+$ helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
 $ helm install --name azuremonitorcontainers incubator/azuremonitor-containers
 
 ```
@@ -58,7 +58,7 @@ The following table lists the configurable parameters of the MSOMS chart and the
 | `omsagent.secret.key`      | Azure Log analytics workspace key                  | Does not have a default value, needs to be provided                              |
 | `omsagent.domain`          | Azure Log analytics cloud domain (public / govt)   | opinsights.azure.com (Public cloud as default), opinsights.azure.us (Govt Cloud) |
 | `omsagent.env.clusterName`             | Name of your cluster      | Does not have a default value, needs to be provided       |
-|`doNotCollectKubeSystemLogs`| Disable collecting logs from containers in 'kube-system' namespace | true|
+|`omsagent.env.doNotCollectKubeSystemLogs`| Disable collecting logs from containers in 'kube-system' namespace | true|
 | `omsagent.rbac`             | rbac enabled/disabled      | true  (i.e enabled)     |
 
 
diff --git a/incubator/azuremonitor-containers/templates/NOTES.txt b/incubator/azuremonitor-containers/templates/NOTES.txt
index 8b985cf9a4..a526d67c2d 100644
--- a/incubator/azuremonitor-containers/templates/NOTES.txt
+++ b/incubator/azuremonitor-containers/templates/NOTES.txt
@@ -28,8 +28,8 @@ This deployment will not complete. To proceed, run
  helm upgrade {{ .Release.Name }} \
    --set omsagent.secret.wsid=<your_workspace_id> \
    --set omsagent.secret.key=<your_workspace_key> \ 
-   --set omsagent.enc.clusterName=<your_cluster_name> \
-   stable/msoms
+   --set omsagent.env.clusterName=<your_cluster_name> \
+   incubator/azuremonitor-containers
    
 {{- else -}}
 
diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml
index a52852e45c..e4fce29390 100644
--- a/incubator/azuremonitor-containers/values.yaml
+++ b/incubator/azuremonitor-containers/values.yaml
@@ -6,10 +6,10 @@
 ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod
 omsagent:
   image:
-    tag: "ciprod06072018"
+    tag: "ciprod07312018"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "2.0.0-3"
-    agentVersion: "1.6.0-42"
+    dockerProviderVersion: "2.0.0-4"
+    agentVersion: "1.6.0-163"
 ## To get your workspace id and key do the following
 ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux.