merge ci_feature to ci_feature_prod for ciprod05262020 release (#407)

* * Update fluentbit to 1.4.2 (from 0.14.4) [This will also fix json serialization encoding issue reported by a customer] * fix crd * Fluent conf fixes and log file rotation (#404) Co-authored-by: Dilip Raghunathan <[email protected]> * Update agent version windows, fix ACR Task (#405) Co-authored-by: Dilip Raghunathan <[email protected]> * updates for release 10.0.0-1 & ciprod05262020 (#406) * updates for release 10.0.0-1 * Update setup.sh * Update setup.sh Co-authored-by: 🌞 Vishwanath Narasimhan 🌤 <[email protected]> Co-authored-by: Dilip Raghunathan <[email protected]> Co-authored-by: Dilip Raghunathan <[email protected]>
microsoft · May 27, 2020 · b100f44 · b100f44
1 parent f461cdf
commit b100f44
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/Kubernetes/omsagent.yaml b/Kubernetes/omsagent.yaml
@@ -672,7 +672,7 @@ spec:
       port: 25227
       targetPort: in-rs-tcp
 ---
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: healthstates.azmon.container.insights

diff --git a/Kubernetes/windows/Dockerfile b/Kubernetes/windows/Dockerfile
@@ -24,7 +24,7 @@ COPY ./fluent/rubyKeepCertificateAlive/*.rb /etc/fluent/plugin/
 COPY ./fluent-bit/fluent-bit.conf /etc/fluent-bit
 COPY ./omsagentwindows/out_oms.conf /etc/omsagentwindows
 
-ENV AGENT_VERSION "winakslogprivatepreview"
+ENV AGENT_VERSION "win-ciprod05262020"
 ENV OS_TYPE "windows"
 ENV APPLICATIONINSIGHTS_AUTH "OTQzNWI0M2YtOTdkNS00ZGVkLThkOTAtYjA0Nzk1OGU2ZTg3"
 ENV AZMON_COLLECT_ENV False

diff --git a/Kubernetes/windows/acrWorkflows/acrcreate.ps1 b/Kubernetes/windows/acrWorkflows/acrcreate.ps1
@@ -2,7 +2,7 @@
 az acr task create -n createimagewincifeaturecidev -r containerinsightsprod -c https://github.com/Microsoft/OMS-docker.git --branch ci_feature --file Kubernetes/windows/acrWorkflows/acrwindowsdevnamespace.yaml --commit-trigger-enabled true --platform Windows/amd64 --git-access-token 00000000000000000000000000 --auth-mode Default --debug
 
 # create acr task for windows from ci_feature_prod branch to create image in ciprod repository
-az acr task create -n createimagewincifeatureciprod -r containerinsightsprod -c https://github.com/Microsoft/OMS-docker.git --branch ci_feature --file Kubernetes/windows/acrWorkflows/acrwindowsprodnamespace.yaml.yaml --commit-trigger-enabled true --platform Windows/amd64 --git-access-token 00000000000000000000000000 --auth-mode Default --debug
+az acr task create -n createimagewincifeatureciprod -r containerinsightsprod -c https://github.com/Microsoft/OMS-docker.git --branch ci_feature_prod --file Kubernetes/windows/acrWorkflows/acrwindowsprodnamespace.yaml --commit-trigger-enabled true --platform Windows/amd64 --git-access-token 00000000000000000000000000  --auth-mode Default --debug
 
 
 # test task

diff --git a/Kubernetes/windows/fluent/fluent.conf b/Kubernetes/windows/fluent/fluent.conf
@@ -9,7 +9,7 @@
   path /var/log/containers/*.log
   pos_file /var/opt/microsoft/fluent/fluentd-containers.log.pos
   tag oms.container.log.la
-  @log_level trace
+  @log_level info
   path_key tailed_path
   limit_recently_modified 5m
   <parse>
@@ -24,7 +24,7 @@
   path  /var/log/containers/omsagent*.log
   pos_file /opt/microsoft/fluent/omsagent-fluentd-containers.log.pos
   tag oms.container.log.flbplugin
-  @log_level trace
+  @log_level info
   path_key tailed_path
   read_from_head true
   <parse>

diff --git a/Kubernetes/windows/scripts/powershell/main.ps1 b/Kubernetes/windows/scripts/powershell/main.ps1
@@ -94,7 +94,9 @@ function Start-Fluent
 
     #register fluentd as a service and start
     # there is a known issues with win32-service https://github.com/chef/win32-service/issues/70
-    fluentd --reg-winsvc i --reg-winsvc-auto-start --winsvc-name fluentdwinaks --reg-winsvc-fluentdopt '-c C:/etc/fluent/fluent.conf -o C:/etc/fluent/fluent.log'
+    # log-rotate-age -- keep 1 generation
+    # log-rotate-size 10 MB
+    fluentd --reg-winsvc i --reg-winsvc-auto-start --winsvc-name fluentdwinaks --reg-winsvc-fluentdopt '-c C:/etc/fluent/fluent.conf -o C:/etc/fluent/fluent.log --log-rotate-age 1 --log-rotate-size 10485760'
 
     Notepad.exe | Out-Null
 }

diff --git a/ci_feature/Dockerfile b/ci_feature/Dockerfile
@@ -2,18 +2,18 @@ FROM ubuntu:18.04
 MAINTAINER [email protected]
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="OMS Container Docker Provider" \
-    com.microsoft.version="10.0.0-0"
+    com.microsoft.version="10.0.0-1"
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH OTQzNWI0M2YtOTdkNS00ZGVkLThkOTAtYjA0Nzk1OGU2ZTg3
-ENV AGENT_VERSION ciprod05222020
+ENV AGENT_VERSION ciprod05262020
 ENV MALLOC_ARENA_MAX 2
 ENV HOST_MOUNT_PREFIX /hostfs
 ENV HOST_PROC /hostfs/proc
 ENV HOST_SYS /hostfs/sys
 ENV HOST_ETC /hostfs/etc
 ENV HOST_VAR /hostfs/var
 ENV AZMON_COLLECT_ENV False
-ENV KUBE_CLIENT_BACKOFF_BASE 1 
+ENV KUBE_CLIENT_BACKOFF_BASE 1
 ENV KUBE_CLIENT_BACKOFF_DURATION 0
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes init-system-helpers  net-tools rsyslog cron vim dmidecode apt-transport-https gnupg && rm -rf /var/lib/apt/lists/*
 COPY setup.sh main.sh defaultpromenvvariables defaultpromenvvariables-rs $tmpdir/

diff --git a/ci_feature/setup.sh b/ci_feature/setup.sh
@@ -14,7 +14,7 @@ wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent
 #create file to disable omi service startup script
 touch /etc/.omi_disable_service_control
 
-wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0.0/docker-cimprov-10.0.0-0.universal.x86_64.sh
+wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0-1/docker-cimprov-10.0.0-1.universal.x86_64.sh
 
 chmod 775 $TMPDIR/*.sh
 
@@ -43,7 +43,7 @@ sudo apt-get install inotify-tools -y
 #used to parse response of kubelet apis
 sudo apt-get install jq -y
 
-#used to setcaps for ruby process to read /proc/env 
+#used to setcaps for ruby process to read /proc/env
 echo "installing libcap2-bin"
 sudo apt-get install libcap2-bin -y
 

diff --git a/ci_feature_prod/Dockerfile b/ci_feature_prod/Dockerfile
@@ -2,18 +2,18 @@ FROM ubuntu:18.04
 MAINTAINER [email protected]
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="OMS Container Docker Provider" \
-    com.microsoft.version="10.0.0-0"
+    com.microsoft.version="10.0.0-1"
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi
-ENV AGENT_VERSION ciprod05222020
+ENV AGENT_VERSION ciprod05262020
 ENV MALLOC_ARENA_MAX 2
 ENV HOST_MOUNT_PREFIX /hostfs
 ENV HOST_PROC /hostfs/proc
 ENV HOST_SYS /hostfs/sys
 ENV HOST_ETC /hostfs/etc
 ENV HOST_VAR /hostfs/var
 ENV AZMON_COLLECT_ENV False
-ENV KUBE_CLIENT_BACKOFF_BASE 1 
+ENV KUBE_CLIENT_BACKOFF_BASE 1
 ENV KUBE_CLIENT_BACKOFF_DURATION 0
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -y libc-bin wget openssl curl sudo python-ctypes init-system-helpers  net-tools rsyslog cron vim dmidecode apt-transport-https gnupg && rm -rf /var/lib/apt/lists/*
 COPY setup.sh main.sh defaultpromenvvariables defaultpromenvvariables-rs $tmpdir/

diff --git a/ci_feature_prod/setup.sh b/ci_feature_prod/setup.sh
@@ -14,7 +14,7 @@ wget https://github.com/Microsoft/OMS-Agent-for-Linux/releases/download/OMSAgent
 #create file to disable omi service startup script
 touch /etc/.omi_disable_service_control
 
-wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0.0/docker-cimprov-10.0.0-0.universal.x86_64.sh
+wget https://github.com/microsoft/Docker-Provider/releases/download/10.0.0-1/docker-cimprov-10.0.0-1.universal.x86_64.sh
 
 chmod 775 $TMPDIR/*.sh
 
@@ -43,7 +43,7 @@ sudo apt-get install inotify-tools -y
 #used to parse response of kubelet apis
 sudo apt-get install jq -y
 
-#used to setcaps for ruby process to read /proc/env 
+#used to setcaps for ruby process to read /proc/env
 echo "installing libcap2-bin"
 sudo apt-get install libcap2-bin -y
 #/$TMPDIR/omsbundle/oss-kits/docker-cimprov-1.0.0-*.x86_64.sh --install
@@ -63,7 +63,7 @@ chmod 777 /opt/telegraf
 
 #download and install fluent-bit(td-agent-bit)
 wget -qO - https://packages.fluentbit.io/fluentbit.key | sudo apt-key add -
-sudo echo "deb https://packages.fluentbit.io/ubuntu/xenial xenial main" >> /etc/apt/sources.list  
+sudo echo "deb https://packages.fluentbit.io/ubuntu/xenial xenial main" >> /etc/apt/sources.list
 sudo apt-get update
 sudo apt-get install td-agent-bit=1.4.2 -y