From bbd67048a4f73c771e19c7f1df092c58d5203ca8 Mon Sep 17 00:00:00 2001
From: David Tesar <david.tesar@microsoft.com>
Date: Fri, 9 Feb 2018 15:22:52 -0800
Subject: [PATCH] Updates to stable/msoms (#3658)

* latest oms values

* Add logpath, fix lint

* fix EOL lint
---
 stable/msoms/Chart.yaml                       |  6 +-
 .../msoms/templates/omsagent-daemonset.yaml   |  7 +-
 stable/msoms/values.yaml                      | 67 ++++++++++---------
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/stable/msoms/Chart.yaml b/stable/msoms/Chart.yaml
index a144d0e8fc..556813af37 100644
--- a/stable/msoms/Chart.yaml
+++ b/stable/msoms/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: msoms
-version: 0.1.1
-appVersion: 1.0.0-28
+version: 0.1.2
+appVersion: 1.0.0-30
 description: A chart for deploying omsagent as a daemonset Kubernetes
 keywords:
   - monitoring
@@ -19,4 +19,4 @@ maintainers:
   - name: Sambit Mishra
     email: samis@microsoft.com
   - name: Keiko Harada
-    email: keikhara@microsoft.com
\ No newline at end of file
+    email: keikhara@microsoft.com
diff --git a/stable/msoms/templates/omsagent-daemonset.yaml b/stable/msoms/templates/omsagent-daemonset.yaml
index 3518de3316..10a8a5c677 100644
--- a/stable/msoms/templates/omsagent-daemonset.yaml
+++ b/stable/msoms/templates/omsagent-daemonset.yaml
@@ -18,7 +18,7 @@ spec:
     app: {{ template "msoms.name" .   }}
    annotations:
     agentVersion: {{ .Values.omsagent.image.tag }}
-    dockerProviderVersion: 10.0.0-28
+    dockerProviderVersion: {{ .Values.omsagent.image.dockerProviderVersion }}
   spec:
    containers:
      - name: {{ template "msoms.name" . }}
@@ -38,6 +38,8 @@ spec:
           name: docker-sock
         - mountPath: /var/log
           name: host-log
+        - mountPath: /var/lib/docker/containers
+          name: containerlog-path
         - mountPath: /etc/omsagent-secret
           name: omsagent-secret
           readOnly: true
@@ -56,6 +58,9 @@ spec:
     - name: host-log
       hostPath:
        path: /var/log
+    - name: containerlog-path
+      hostPath:
+       path: /var/lib/docker/containers
     - name: omsagent-secret
       secret:
        secretName: {{ template "msoms.fullname" .}}
diff --git a/stable/msoms/values.yaml b/stable/msoms/values.yaml
index 1da6cb8378..d1a8a25591 100644
--- a/stable/msoms/values.yaml
+++ b/stable/msoms/values.yaml
@@ -1,33 +1,34 @@
-## Default values for omsagent.
-
-## Microsoft OMS Agent image 
-## ref: https://github.com/Microsoft/OMS-docker/blob/master/ReleaseNote.md
-omsagent:
-  image:
-    tag: 1.4.1-45
-    pullPolicy: IfNotPresent
-## To get your workspace id and key do the following
-## - In the Azure Log Analytics portal, on the Overview page, click the Settings tile. Click the Connected Sources tab at the left and select "Linux Server" on the right hand side.
-## - On the right of Workspace ID, click the copy icon and paste the ID into Notepad.
-## - On the right of Primary Key, click the copy icon and paste the key into Notepad.
-## For more information, please go [here.](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-windows-agents#download-the-agent-setup-file-from-oms)
-    
-  secret:
-   wsid: <your_workspace_id>
-   key: <your_workspace_key>
-  domain: opinsights.azure.com
-
-## Configure resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-##
-resources:
-  requests:
-    cpu: 100m
-    memory: 512Mi
-  limits:
-    cpu: 500m
-    memory: 768Mi  
-
-# Node selector - default to Linux as cannot deploy OMS agent container to Windows nodes
-nodeSelector:
-  beta.kubernetes.io/os: linux
+## Default values for omsagent.
+
+## Microsoft OMS Agent image
+## ref: https://github.com/Microsoft/OMS-docker/blob/master/ReleaseNote.md
+omsagent:
+  image:
+    tag: 1.4.3-174
+    pullPolicy: IfNotPresent
+    dockerProviderVersion: 1.0.0-30
+## To get your workspace id and key do the following
+## - In the Azure Log Analytics portal, on the Overview page, click the Settings tile. Click the Connected Sources tab at the left and select "Linux Server" on the right hand side.
+## - On the right of Workspace ID, click the copy icon and paste the ID into Notepad.
+## - On the right of Primary Key, click the copy icon and paste the key into Notepad.
+## For more information, please go [here.](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-windows-agents#download-the-agent-setup-file-from-oms)
+
+  secret:
+    wsid: <your_workspace_id>
+    key: <your_workspace_key>
+  domain: opinsights.azure.com
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    cpu: 100m
+    memory: 512Mi
+  limits:
+    cpu: 500m
+    memory: 768Mi
+
+# Node selector - default to Linux as cannot deploy OMS agent container to Windows nodes
+nodeSelector:
+  beta.kubernetes.io/os: linux