Health private preview agent

Kubernetes/omsagent.yaml

@@ -79,6 +79,14 @@ data:
       log_level debug
      </source>
 
+     #Kubernetes health
+     <source>
+      type kubehealth
+      tag oms.api.KubeHealth.AgentCollectionTime
+      run_interval 60s
+      log_level debug
+     </source>
+
      #cadvisor perf- Windows nodes
      <source>
       type wincadvisorperf
@@ -247,6 +255,18 @@ data:
       max_retry_wait 9m
       retry_mdm_post_wait_minutes 60
      </match>
+
+     <match oms.api.KubeHealth.AgentCollectionTime**>
+      type out_oms_api
+      log_level debug
+      buffer_chunk_limit 10m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_api_kubehealth*.buffer
+      buffer_queue_limit 10
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 30s
+     </match>
 metadata:
   name: omsagent-rs-config
   namespace: kube-system
@@ -259,8 +279,8 @@ metadata:
 type: Opaque
 data:
   #BASE64 ENCODED (Both WSID & KEY) INSIDE DOUBLE QUOTE ("")
-  WSID: "WSID"
-  KEY: "KEY"
+  WSID: "VALUE_WSID"
+  KEY: "VALUE_KEY"
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -291,13 +311,13 @@ spec:
          cpu: 50m
          memory: 150Mi
        env:
-       #- name: AKS_RESOURCE_ID
-       #  value: "VALUE_AKS_RESOURCE_ID_VALUE"
-       #- name: AKS_REGION
-       #  value: "VALUE_AKS_RESOURCE_REGION_VALUE"
+       - name: AKS_RESOURCE_ID
+         value: "VALUE_AKS_RESOURCE_ID_VALUE"
+       - name: AKS_REGION
+         value: "VALUE_AKS_REGION_VALUE"
        #Uncomment below two lines for ACS clusters and set the cluster names manually. Also comment out the above two lines for ACS clusters
-       - name: ACS_RESOURCE_NAME
-         value: "my_acs_cluster_name"
+       #- name: ACS_RESOURCE_NAME
+         #value: "my_acs_cluster_name"
        - name: DISABLE_KUBE_SYSTEM_LOG_COLLECTION
          value: "true"
        - name: CONTROLLER_TYPE

ci_feature/Dockerfile

@@ -5,7 +5,7 @@ com.microsoft.product="OMS  Container Docker Provider" \
 com.microsoft.version="2.0.0-7"
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH OTQzNWI0M2YtOTdkNS00ZGVkLThkOTAtYjA0Nzk1OGU2ZTg3
-ENV AGENT_VERSION ciprod03122019
+ENV AGENT_VERSION healthpreview04122019-1
 ENV AZMON_COLLECT_ENV False
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes sysv-rc net-tools rsyslog cron vim dmidecode apt-transport-https && rm -rf /var/lib/apt/lists/*
 COPY setup.sh main.sh $tmpdir/

ci_feature/setup.sh

@@ -9,14 +9,12 @@ sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.UTF-8
 
-wget https://dockerprovider.blob.core.windows.net/omsagent/omsagent-1.8.1-422.universal.x64.sh
+wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent_v1.8.1.256/omsagent-1.8.1-256.universal.x64.sh
 
 #create file to disable omi service startup script
 touch /etc/.omi_disable_service_control
 
-#wget https://github.com/Microsoft/Docker-Provider/releases/download/hotfix-01292019/docker-cimprov-3.0.0-8.universal.x86_64.sh
-
-wget "https://dockerprovider.blob.core.windows.net/releases/download/4.0.0-0/docker-cimprov-4.0.0-0.universal.x86_64.sh"
+wget https://diliprstorage.blob.core.windows.net/mycontainer/docker-cimprov-3.0.0-5.universal.x86_64.sh
 
 chmod 775 $TMPDIR/*.sh
 

ci_feature_prod/Dockerfile

@@ -5,7 +5,7 @@ com.microsoft.product="OMS Container Docker Provider" \
 com.microsoft.version="2.0.0-3"
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi
-ENV AGENT_VERSION ciprod03122019
+ENV AGENT_VERSION healthpreview04122019-1
 ENV AZMON_COLLECT_ENV False
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes sysv-rc net-tools rsyslog cron vim dmidecode apt-transport-https && rm -rf /var/lib/apt/lists/*
 COPY setup.sh main.sh $tmpdir/

ci_feature_prod/setup.sh

@@ -9,12 +9,12 @@ sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.UTF-8
 
-wget https://dockerprovider.blob.core.windows.net/omsagent/omsagent-1.8.1-416.universal.x64.sh
+wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent_v1.8.1.256/omsagent-1.8.1-256.universal.x64.sh
 
 #create file to disable omi service startup script
 touch /etc/.omi_disable_service_control
 
-wget "https://github.com/Microsoft/Docker-Provider/releases/download/4.0.0-0/docker-cimprov-4.0.0-0.universal.x86_64.sh"
+wget https://diliprstorage.blob.core.windows.net/mycontainer/docker-cimprov-3.0.0-5.universal.x86_64.sh
 
 chmod 775 $TMPDIR/*.sh