Gangams/chart updates oct2021 release

charts/azuremonitor-containers/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 7.0.0-1
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 2.8.3
+version: 2.9.0
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring

charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml

@@ -86,7 +86,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
        - name: SIDECAR_SCRAPING_ENABLED
-         value: "false"
+         value: {{ .Values.omsagent.sidecarscraping | quote }}
        volumeMounts:
         - mountPath: C:\ProgramData\docker\containers
           name: docker-windows-containers
@@ -104,7 +104,11 @@ spec:
             command:
               - cmd
               - /c
-              - C:\opt\omsagentwindows\scripts\cmd\livenessProbe.cmd
+              - C:\opt\omsagentwindows\scripts\cmd\livenessprobe.exe
+              - fluent-bit.exe
+              - fluentdwinaks
+              - "C:\\etc\\omsagentwindows\\filesystemwatcher.txt"
+              - "C:\\etc\\omsagentwindows\\renewcertificate.txt"
           periodSeconds: 60
           initialDelaySeconds: 180
           timeoutSeconds: 15

charts/azuremonitor-containers/templates/omsagent-daemonset.yaml

@@ -132,6 +132,69 @@ spec:
         initialDelaySeconds: 60
         periodSeconds: 60
         timeoutSeconds: 15
+   {{- if .Values.omsagent.sidecarscraping }}
+     - name: omsagent-prometheus
+       {{- if eq (.Values.omsagent.domain | lower) "opinsights.azure.cn" }}
+       image: "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:{{ .Values.omsagent.image.tag }}"
+       {{- else }}
+       image: {{ printf "%s:%s" .Values.omsagent.image.repo .Values.omsagent.image.tag }}
+       {{- end }}
+       imagePullPolicy: IfNotPresent
+       resources:
+{{ toYaml .Values.omsagent.resources.daemonsetlinuxsidecar | indent 9 }}
+       env:
+       {{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
+       - name: AKS_RESOURCE_ID
+         value: {{ .Values.omsagent.env.clusterId | quote }}
+       {{- if ne .Values.omsagent.env.clusterRegion "<your_cluster_region>" }}
+       - name: AKS_REGION
+         value: {{ .Values.omsagent.env.clusterRegion | quote }}
+       {{- end }}
+       {{- else if ne .Values.Azure.Cluster.ResourceId "<your_cluster_id>" }}
+       - name: AKS_RESOURCE_ID
+         value: {{ .Values.Azure.Cluster.ResourceId | quote }}
+       {{- if ne .Values.Azure.Cluster.Region "<your_cluster_region>" }}
+       - name: AKS_REGION
+         value: {{ .Values.Azure.Cluster.Region | quote }}
+       {{- end }}
+       {{- else }}
+       - name: ACS_RESOURCE_NAME
+         value: {{ .Values.omsagent.env.clusterName | quote }}
+       {{- end }}
+       - name: CONTROLLER_TYPE
+         value: "DaemonSet"
+       - name: CONTAINER_TYPE
+         value: "PrometheusSidecar"
+       - name: NODE_IP
+         valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+       - name: ISTEST
+         value: {{ .Values.omsagent.ISTEST | quote }}
+       securityContext:
+         privileged: true
+       volumeMounts:
+         - mountPath: /etc/kubernetes/host
+           name: azure-json-path
+         - mountPath: /etc/omsagent-secret
+           name: omsagent-secret
+           readOnly: true
+         - mountPath: /etc/config/settings
+           name: settings-vol-config
+           readOnly: true
+         - mountPath: /etc/config/osm-settings
+           name: osm-settings-vol-config
+           readOnly: true
+       livenessProbe:
+         exec:
+           command:
+             - /bin/bash
+             - -c
+             - /opt/livenessprobe.sh
+         initialDelaySeconds: 60
+         periodSeconds: 60
+         timeoutSeconds: 15
+   {{- end }}
    {{- with .Values.omsagent.daemonset.affinity }}
    affinity: {{- toYaml . | nindent 8 }}
    {{- end }}
@@ -173,4 +236,8 @@ spec:
       secret:
        secretName: omsagent-adx-secret
        optional: true
+    - name: osm-settings-vol-config
+      configMap:
+        name: container-azm-ms-osmconfig
+        optional: true
 {{- end }}

charts/azuremonitor-containers/templates/omsagent-deployment.yaml

@@ -69,14 +69,14 @@ spec:
               fieldPath: status.hostIP
        {{- if not (empty .Values.Azure.Extension.Name) }}
        - name: ARC_K8S_EXTENSION_NAME
-         value: {{ .Values.Azure.Extension.Name | quote }} 
-       {{- end }}                       
+         value: {{ .Values.Azure.Extension.Name | quote }}
+       {{- end }}
        - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
          value: ""
        - name: SIDECAR_SCRAPING_ENABLED
-         value: "false"
+         value: {{ .Values.omsagent.sidecarscraping | quote }}
        - name: ISTEST
-         value: {{ .Values.omsagent.ISTEST | quote }}       
+         value: {{ .Values.omsagent.ISTEST | quote }}
        securityContext:
          privileged: true
        ports:

charts/azuremonitor-containers/values.yaml

@@ -17,14 +17,14 @@ Azure:
     httpProxy: ""
     httpsProxy: ""
     noProxy: ""
-    proxyCert: ""   
+    proxyCert: ""
 omsagent:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "ciprod04222021"
-    tagWindows: "win-ciprod04222021"
+    tag: "ciprod10112021"
+    tagWindows: "win-ciprod10112021"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "15.0.0-0"
+    dockerProviderVersion: "16.0.0-0"
     agentVersion: "1.10.0.1"
 
   # The priority used by the omsagent priority class for the daemonset pods
@@ -39,7 +39,7 @@ omsagent:
   # chance to build pod for the node and give it to the scheduler)
   # Should be some number greater than default (0)
   priority: 10
-  
+
   # This used for running agent pods in test mode.
   # if set to true additional agent workflow logs will be emitted which are used for e2e and arc k8s conformance testing
   ISTEST: false
@@ -58,10 +58,11 @@ omsagent:
     clusterId: <your_cluster_id>
     clusterRegion: <your_cluster_region>
   rbac: true
+  sidecarscraping: true
   logsettings:
-    logflushintervalsecs: ""
-    tailbufchunksizemegabytes: ""
-    tailbufmaxsizemegabytes: ""
+    logflushintervalsecs: "15"
+    tailbufchunksizemegabytes: "1"
+    tailbufmaxsizemegabytes: "1"
     ## Applicable for only Azure Stack Edge K8s since it has custom mount path for container logs which will have symlink to /var/log path
     custommountpath: ""
 
@@ -171,10 +172,10 @@ omsagent:
     daemonsetlinux:
       requests:
         cpu: 75m
-        memory: 225Mi
+        memory: 325Mi
       limits:
         cpu: 150m
-        memory: 600Mi
+        memory: 750Mi
     daemonsetwindows:
       limits:
         cpu: 200m
@@ -186,3 +187,11 @@ omsagent:
       limits:
         cpu: 1
         memory: 1Gi
+    daemonsetlinuxsidecar:
+        limits:
+          cpu: 500m
+          memory: 1Gi
+        requests:
+          cpu: 75m
+          memory: 225Mi
+