From 9ebd013de1b5035c4ad215a9cbf3166b00448627 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Tue, 11 May 2021 15:45:13 -0700 Subject: [PATCH 01/12] update to latest omsagent, add eastus2 to mdsd regions --- kubernetes/linux/envmdsd | 4 ++++ kubernetes/linux/setup.sh | 3 ++- kubernetes/omsagent.yaml | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kubernetes/linux/envmdsd b/kubernetes/linux/envmdsd index e4886012e..b715c796d 100644 --- a/kubernetes/linux/envmdsd +++ b/kubernetes/linux/envmdsd @@ -12,3 +12,7 @@ export HOSTNAME_OVERRIDE="${NODE_NAME}" export MDSD_TCMALLOC_RELEASE_FREQ_SEC=1 export MDSD_COMPRESSION_ALGORITHM=LZ4 export SSL_CERT_DIR="/etc/ssl/certs" +# increase the size of msgpack items mdsd will accept, otherwise they will be silently dropped. These values were arbitrairly chosen to be 10 or 100 times larger than the defaults. +export MDSD_MSGPACK_ARRAY_SIZE_ITEMS=10000000 +export MDSD_MSGPACK_MAP_SIZE_ITEMS=10000000 +export MDSD_MSGPACK_NESTING_LEVEL=100 \ No newline at end of file diff --git a/kubernetes/linux/setup.sh b/kubernetes/linux/setup.sh index ee3756964..dd786e07d 100644 --- a/kubernetes/linux/setup.sh +++ b/kubernetes/linux/setup.sh @@ -32,7 +32,8 @@ mv $TMPDIR/omsbundle* $TMPDIR/omsbundle #/usr/bin/dpkg -i $TMPDIR/omsbundle/100/omsconfig*.deb #install oneagent - Official bits (10/18) -wget https://github.com/microsoft/Docker-Provider/releases/download/10182020-oneagent/azure-mdsd_1.5.126-build.master.99_x86_64.deb +# wget https://github.com/microsoft/Docker-Provider/releases/download/10182020-oneagent/azure-mdsd_1.5.126-build.master.99_x86_64.deb +wget http://packages.microsoft.com/repos/azurecore/pool/main/a/azure-mdsd/azure-mdsd_1.8.0-build.master.189_x86_64.deb /usr/bin/dpkg -i $TMPDIR/azure-mdsd*.deb cp -f $TMPDIR/mdsd.xml /etc/mdsd.d cp -f $TMPDIR/envmdsd /etc/mdsd.d diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index feea3f29a..29cbde927 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -358,7 +358,7 @@ spec: tier: node annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.0.0-0" + dockerProviderVersion: "15.1.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent @@ -399,7 +399,7 @@ spec: - name: USER_ASSIGNED_IDENTITY_CLIENT_ID value: "" - name: AZMON_CONTAINERLOGS_ONEAGENT_REGIONS - value: "koreacentral,norwayeast" + value: "koreacentral,norwayeast,eastus2" securityContext: privileged: true ports: From ce67d6edeb2e35dd6887ef1eefbc44a7d0275d52 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Tue, 11 May 2021 16:11:50 -0700 Subject: [PATCH 02/12] copied oneagent bits to a CI repository release --- kubernetes/linux/setup.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kubernetes/linux/setup.sh b/kubernetes/linux/setup.sh index dd786e07d..f065cc165 100644 --- a/kubernetes/linux/setup.sh +++ b/kubernetes/linux/setup.sh @@ -31,9 +31,8 @@ mv $TMPDIR/omsbundle* $TMPDIR/omsbundle /usr/bin/dpkg -i $TMPDIR/omsbundle/110/omsagent*.deb #/usr/bin/dpkg -i $TMPDIR/omsbundle/100/omsconfig*.deb -#install oneagent - Official bits (10/18) -# wget https://github.com/microsoft/Docker-Provider/releases/download/10182020-oneagent/azure-mdsd_1.5.126-build.master.99_x86_64.deb -wget http://packages.microsoft.com/repos/azurecore/pool/main/a/azure-mdsd/azure-mdsd_1.8.0-build.master.189_x86_64.deb +#install oneagent - Official bits (05/2021) +wget https://github.com/microsoft/Docker-Provider/releases/download/05112021-oneagent/azure-mdsd_1.8.0-build.master.189_x86_64.deb /usr/bin/dpkg -i $TMPDIR/azure-mdsd*.deb cp -f $TMPDIR/mdsd.xml /etc/mdsd.d cp -f $TMPDIR/envmdsd /etc/mdsd.d From a624bfcae81f994df4de1ac2a1736dd81e798c75 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 12 May 2021 09:23:17 -0700 Subject: [PATCH 03/12] mdsd inmem mode --- build/linux/installer/scripts/livenessprobe.sh | 2 +- kubernetes/linux/envmdsd | 2 +- kubernetes/linux/main.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/linux/installer/scripts/livenessprobe.sh b/build/linux/installer/scripts/livenessprobe.sh index e3b0fc28e..198b4e87f 100644 --- a/build/linux/installer/scripts/livenessprobe.sh +++ b/build/linux/installer/scripts/livenessprobe.sh @@ -10,7 +10,7 @@ fi #optionally test to exit non zero value if oneagent is not running if [ -e "/opt/AZMON_CONTAINER_LOGS_EFFECTIVE_ROUTE_V2" ]; then - (ps -ef | grep "mdsd -l" | grep -v "grep") + (ps -ef | grep "mdsd" | grep -v "grep") if [ $? -ne 0 ] then echo "oneagent is not running" > /dev/termination-log diff --git a/kubernetes/linux/envmdsd b/kubernetes/linux/envmdsd index b715c796d..3f834bfb8 100644 --- a/kubernetes/linux/envmdsd +++ b/kubernetes/linux/envmdsd @@ -15,4 +15,4 @@ export SSL_CERT_DIR="/etc/ssl/certs" # increase the size of msgpack items mdsd will accept, otherwise they will be silently dropped. These values were arbitrairly chosen to be 10 or 100 times larger than the defaults. export MDSD_MSGPACK_ARRAY_SIZE_ITEMS=10000000 export MDSD_MSGPACK_MAP_SIZE_ITEMS=10000000 -export MDSD_MSGPACK_NESTING_LEVEL=100 \ No newline at end of file +export MDSD_MSGPACK_NESTING_LEVEL=100 diff --git a/kubernetes/linux/main.sh b/kubernetes/linux/main.sh index 81db6f3a4..f03318ad1 100644 --- a/kubernetes/linux/main.sh +++ b/kubernetes/linux/main.sh @@ -581,7 +581,7 @@ if [ ! -e "/etc/config/kube.conf" ] && [ "${CONTAINER_TYPE}" != "PrometheusSidec dpkg -l | grep mdsd | awk '{print $2 " " $3}' echo "starting mdsd ..." - mdsd -l -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos & + mdsd -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos & touch /opt/AZMON_CONTAINER_LOGS_EFFECTIVE_ROUTE_V2 fi From 89be4a2a97feed9755af6f89350a1a9335c7c75b Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 12 May 2021 13:12:18 -0700 Subject: [PATCH 04/12] yaml for cl scale test --- .../ci-log-scale-4kpersec-5klogline.yaml | 60 +++++++++++++++++++ .../demo.yaml:Zone.Identifier | 4 ++ 2 files changed, 64 insertions(+) create mode 100644 test/containerlog-scale-tests/ci-log-scale-4kpersec-5klogline.yaml create mode 100644 test/containerlog-scale-tests/demo.yaml:Zone.Identifier diff --git a/test/containerlog-scale-tests/ci-log-scale-4kpersec-5klogline.yaml b/test/containerlog-scale-tests/ci-log-scale-4kpersec-5klogline.yaml new file mode 100644 index 000000000..ff619a822 --- /dev/null +++ b/test/containerlog-scale-tests/ci-log-scale-4kpersec-5klogline.yaml @@ -0,0 +1,60 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: ci-log-scale +spec: + parallelism: 1 + completions: 1 + template: + metadata: + name: ci-log-scale + spec: + volumes: + - name: ci-log-scale-scripts-volume + configMap: + name: test-scripts + containers: + - name: ci-log-scale + image: ubuntu + volumeMounts: + - mountPath: /test-scripts + name: ci-log-scale-scripts-volume + env: + - name: HOME + value: /tmp + command: + - /bin/sh + - -c + - | + echo "scripts in /test-scripts" + ls -lh /test-scripts + echo "copy scripts to /tmp" + cp /test-scripts/*.sh /tmp + echo "apply 'chmod +x' to /tmp/*.sh" + chmod +x /tmp/*.sh + echo "script.sh in /tmp" + ls -lh /tmp + /tmp/script.sh + restartPolicy: Never +--- +apiVersion: v1 +items: +- apiVersion: v1 + data: + script.sh: | + #!/bin/bash + logentry='' + for var in {1..1024..1} + do + logentry="${logentry}Test-" + done + for var in {1..200000..1} + do + echo $(date "+%Y/%m/%d %H:%M:%S.%3N") ${var}: $logentry + done + kind: ConfigMap + metadata: + creationTimestamp: null + name: test-scripts +kind: List +metadata: {} diff --git a/test/containerlog-scale-tests/demo.yaml:Zone.Identifier b/test/containerlog-scale-tests/demo.yaml:Zone.Identifier new file mode 100644 index 000000000..e46a1d47c --- /dev/null +++ b/test/containerlog-scale-tests/demo.yaml:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://teams.microsoft.com/_ +HostUrl=https://microsoft-my.sharepoint.com/personal/gangams_microsoft_com/_layouts/15/download.aspx?UniqueId=307c28a2-d9f7-4034-8557-545250ca38a3&Translate=false&tempauth=eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIwMDAwMDAwMy0wMDAwLTBmZjEtY2UwMC0wMDAwMDAwMDAwMDAvbWljcm9zb2Z0LW15LnNoYXJlcG9pbnQuY29tQDcyZjk4OGJmLTg2ZjEtNDFhZi05MWFiLTJkN2NkMDExZGI0NyIsImlzcyI6IjAwMDAwMDAzLTAwMDAtMGZmMS1jZTAwLTAwMDAwMDAwMDAwMCIsIm5iZiI6IjE2MjA4MDI1NjQiLCJleHAiOiIxNjIwODAyODY0IiwiZW5kcG9pbnR1cmwiOiIxZEd1ZVFwNjhvb1E0UDUzc3pPNHhRVVZLaHhJZks2TzBUb2g2MGY4blhvPSIsImVuZHBvaW50dXJsTGVuZ3RoIjoiMTU0IiwiaXNsb29wYmFjayI6IlRydWUiLCJjaWQiOiJPVFF4T0dNM09XWXRZVEE0Tnkwd01EQXdMV1EzTnpFdE5EZGlabUV4TUdVME16a3ciLCJ2ZXIiOiJoYXNoZWRwcm9vZnRva2VuIiwic2l0ZWlkIjoiTTJVeFlXUXdOMkV0WldNMlppMDBaV1ExTFRrNE1HSXRaR1UwWWpJeU1ESmxNemswIiwiYXBwX2Rpc3BsYXluYW1lIjoiTWljcm9zb2Z0IFRlYW1zIiwiZ2l2ZW5fbmFtZSI6IkdhbmdhIE1haGVzaCIsImZhbWlseV9uYW1lIjoiU2lkZGVtIiwic2lnbmluX3N0YXRlIjoiW1wiZHZjX2NtcFwiXSIsImNvbnRyb2xzIjoiW1wiYXBwX3Jlc1wiXSIsImFwcGlkIjoiMWZlYzhlNzgtYmNlNC00YWFmLWFiMWItNTQ1MWNjMzg3MjY0IiwidGlkIjoiNzJmOTg4YmYtODZmMS00MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3IiwidXBuIjoiZ2FuZ2Ftc0BtaWNyb3NvZnQuY29tIiwicHVpZCI6IjEwMDMwMDAwODAxQzIzRUMiLCJjYWNoZWtleSI6IjBoLmZ8bWVtYmVyc2hpcHwxMDAzMDAwMDgwMWMyM2VjQGxpdmUuY29tIiwic2NwIjoibXlmaWxlcy53cml0ZSBhbGxzaXRlcy5mdWxsY29udHJvbCBhbGxzaXRlcy5tYW5hZ2UgYWxscHJvZmlsZXMud3JpdGUiLCJhY3JzIjoicjIscjMsYzEsYzIsYzMsYzQsYzUsYzYiLCJ0dCI6IjIiLCJ1c2VQZXJzaXN0ZW50Q29va2llIjpudWxsfQ.NFJJeE1aNTFldVRjQ21QL2NRdnV1RjhxdkxmT256ZFpMSEVyRGxtYXhkND0&ApiVersion=2.0 From 46848d0a0719af9198de9e29fdb00d394f040a7f Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 12 May 2021 13:13:00 -0700 Subject: [PATCH 05/12] yaml for cl scale test --- test/containerlog-scale-tests/demo.yaml:Zone.Identifier | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 test/containerlog-scale-tests/demo.yaml:Zone.Identifier diff --git a/test/containerlog-scale-tests/demo.yaml:Zone.Identifier b/test/containerlog-scale-tests/demo.yaml:Zone.Identifier deleted file mode 100644 index e46a1d47c..000000000 --- a/test/containerlog-scale-tests/demo.yaml:Zone.Identifier +++ /dev/null @@ -1,4 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=https://teams.microsoft.com/_ -HostUrl=https://microsoft-my.sharepoint.com/personal/gangams_microsoft_com/_layouts/15/download.aspx?UniqueId=307c28a2-d9f7-4034-8557-545250ca38a3&Translate=false&tempauth=eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIwMDAwMDAwMy0wMDAwLTBmZjEtY2UwMC0wMDAwMDAwMDAwMDAvbWljcm9zb2Z0LW15LnNoYXJlcG9pbnQuY29tQDcyZjk4OGJmLTg2ZjEtNDFhZi05MWFiLTJkN2NkMDExZGI0NyIsImlzcyI6IjAwMDAwMDAzLTAwMDAtMGZmMS1jZTAwLTAwMDAwMDAwMDAwMCIsIm5iZiI6IjE2MjA4MDI1NjQiLCJleHAiOiIxNjIwODAyODY0IiwiZW5kcG9pbnR1cmwiOiIxZEd1ZVFwNjhvb1E0UDUzc3pPNHhRVVZLaHhJZks2TzBUb2g2MGY4blhvPSIsImVuZHBvaW50dXJsTGVuZ3RoIjoiMTU0IiwiaXNsb29wYmFjayI6IlRydWUiLCJjaWQiOiJPVFF4T0dNM09XWXRZVEE0Tnkwd01EQXdMV1EzTnpFdE5EZGlabUV4TUdVME16a3ciLCJ2ZXIiOiJoYXNoZWRwcm9vZnRva2VuIiwic2l0ZWlkIjoiTTJVeFlXUXdOMkV0WldNMlppMDBaV1ExTFRrNE1HSXRaR1UwWWpJeU1ESmxNemswIiwiYXBwX2Rpc3BsYXluYW1lIjoiTWljcm9zb2Z0IFRlYW1zIiwiZ2l2ZW5fbmFtZSI6IkdhbmdhIE1haGVzaCIsImZhbWlseV9uYW1lIjoiU2lkZGVtIiwic2lnbmluX3N0YXRlIjoiW1wiZHZjX2NtcFwiXSIsImNvbnRyb2xzIjoiW1wiYXBwX3Jlc1wiXSIsImFwcGlkIjoiMWZlYzhlNzgtYmNlNC00YWFmLWFiMWItNTQ1MWNjMzg3MjY0IiwidGlkIjoiNzJmOTg4YmYtODZmMS00MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3IiwidXBuIjoiZ2FuZ2Ftc0BtaWNyb3NvZnQuY29tIiwicHVpZCI6IjEwMDMwMDAwODAxQzIzRUMiLCJjYWNoZWtleSI6IjBoLmZ8bWVtYmVyc2hpcHwxMDAzMDAwMDgwMWMyM2VjQGxpdmUuY29tIiwic2NwIjoibXlmaWxlcy53cml0ZSBhbGxzaXRlcy5mdWxsY29udHJvbCBhbGxzaXRlcy5tYW5hZ2UgYWxscHJvZmlsZXMud3JpdGUiLCJhY3JzIjoicjIscjMsYzEsYzIsYzMsYzQsYzUsYzYiLCJ0dCI6IjIiLCJ1c2VQZXJzaXN0ZW50Q29va2llIjpudWxsfQ.NFJJeE1aNTFldVRjQ21QL2NRdnV1RjhxdkxmT256ZFpMSEVyRGxtYXhkND0&ApiVersion=2.0 From 3f732f2222e0bd558dae5717283e988bdc3617c0 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 14:47:44 -0700 Subject: [PATCH 06/12] reverting dockerProviderVersion version to 15.0.0 --- kubernetes/omsagent.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 29cbde927..7d2eb2e03 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -358,7 +358,7 @@ spec: tier: node annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.1.0-0" + dockerProviderVersion: "15.0.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent From 5f93562b2d83f28adeb1c4d29c2e5d15143c5e7d Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 14:52:53 -0700 Subject: [PATCH 07/12] prepping for release (updated image version, dockerProviderVersion, and release notes --- ReleaseNotes.md | 9 ++++++++- build/version | 4 ++-- kubernetes/linux/Dockerfile | 2 +- kubernetes/omsagent.yaml | 6 +++--- kubernetes/windows/Dockerfile | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index acbd579a0..ee45d3ef2 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -11,6 +11,14 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), which indicate the agent build dates (not release dates) + +### 05/12/2021 - +##### Version microsoft/oms:ciprod00512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod00512021 (linux) +##### Version microsoft/oms:win-ciprod05122021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05122021 (windows) +##### Code change log +- Upgrading oneagent to version 1.8 (only for Linux) +- Enabling oneagent for East US 2 + ### 04/22/2021 - ##### Version microsoft/oms:ciprod04222021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod04222021 (linux) ##### Version microsoft/oms:win-ciprod04222021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod04222021 (windows) @@ -27,7 +35,6 @@ Note : The agent version(s) below has dates (ciprod), which indicate t - Doc updates - Minor telemetry changes - ### 03/26/2021 - ##### Version microsoft/oms:ciprod03262021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03262021 (linux) ##### Version microsoft/oms:win-ciprod03262021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod03262021 (windows) diff --git a/build/version b/build/version index 16a43604a..81bb808f5 100644 --- a/build/version +++ b/build/version @@ -3,10 +3,10 @@ # Build Version Information CONTAINER_BUILDVERSION_MAJOR=15 -CONTAINER_BUILDVERSION_MINOR=0 +CONTAINER_BUILDVERSION_MINOR=1 CONTAINER_BUILDVERSION_PATCH=0 CONTAINER_BUILDVERSION_BUILDNR=0 -CONTAINER_BUILDVERSION_DATE=20210422 +CONTAINER_BUILDVERSION_DATE=20210512 CONTAINER_BUILDVERSION_STATUS=Developer_Build #-------------------------------- End of File ----------------------------------- diff --git a/kubernetes/linux/Dockerfile b/kubernetes/linux/Dockerfile index d5ece4509..822e52bc8 100644 --- a/kubernetes/linux/Dockerfile +++ b/kubernetes/linux/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 MAINTAINER OMSContainers@microsoft.com LABEL vendor=Microsoft\ Corp \ com.microsoft.product="Azure Monitor for containers" -ARG IMAGE_TAG=ciprod04222021 +ARG IMAGE_TAG=ciprod05122021 ENV AGENT_VERSION ${IMAGE_TAG} ENV tmpdir /opt ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 7d2eb2e03..01d755f0f 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -358,7 +358,7 @@ spec: tier: node annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.0.0-0" + dockerProviderVersion: "15.1.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent @@ -583,7 +583,7 @@ spec: rsName: "omsagent-rs" annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.0.0-0" + dockerProviderVersion: "15.1.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent @@ -750,7 +750,7 @@ spec: tier: node-win annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.0.0-0" + dockerProviderVersion: "15.1.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile index fefd089a8..e57afab7c 100644 --- a/kubernetes/windows/Dockerfile +++ b/kubernetes/windows/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER OMSContainers@microsoft.com LABEL vendor=Microsoft\ Corp \ com.microsoft.product="Azure Monitor for containers" -ARG IMAGE_TAG=win-ciprod04222021 +ARG IMAGE_TAG=win-ciprod05122021 # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement From d17ddb2e8fe2b3c0a93d709d1795a1e1c604f5fa Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 12 May 2021 14:52:56 -0700 Subject: [PATCH 08/12] container log scaletest yamls --- .../400logspersec-2klogentrysize.yaml | 60 +++++++++++++++++++ .../400logspersec-5klogentrysize.yaml | 60 +++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 test/containerlog-scale-tests/400logspersec-2klogentrysize.yaml create mode 100644 test/containerlog-scale-tests/400logspersec-5klogentrysize.yaml diff --git a/test/containerlog-scale-tests/400logspersec-2klogentrysize.yaml b/test/containerlog-scale-tests/400logspersec-2klogentrysize.yaml new file mode 100644 index 000000000..cc3dd5259 --- /dev/null +++ b/test/containerlog-scale-tests/400logspersec-2klogentrysize.yaml @@ -0,0 +1,60 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: logs-400persec-2kentrysize +spec: + parallelism: 1 + completions: 1 + template: + metadata: + name: logs-400persec-2kentrysize + spec: + volumes: + - name: logs-400persec-2kentrysize-scripts-volume + configMap: + name: logs-400persec-test-scripts + containers: + - name: logs-400persec-2kentrysize + image: ubuntu + volumeMounts: + - mountPath: /logs-400persec-test-scripts + name: logs-400persec-2kentrysize-scripts-volume + env: + - name: HOME + value: /tmp + command: + - /bin/sh + - -c + - | + echo "scripts in /logs-400persec-test-scripts" + ls -lh /logs-400persec-test-scripts + echo "copy scripts to /tmp" + cp /logs-400persec-test-scripts/*.sh /tmp + echo "apply 'chmod +x' to /tmp/*.sh" + chmod +x /tmp/*.sh + echo "script.sh in /tmp" + ls -lh /tmp + /tmp/script.sh + restartPolicy: Never +--- +apiVersion: v1 +items: +- apiVersion: v1 + data: + script.sh: | + #!/bin/bash + logentry='' + for var in {1..400..1} + do + logentry="${logentry}Test-" + done + for var in {1..200000..1} + do + echo $(date "+%Y/%m/%d %H:%M:%S.%3N") ${var}: $logentry + done + kind: ConfigMap + metadata: + creationTimestamp: null + name: logs-400persec-test-scripts +kind: List +metadata: {} diff --git a/test/containerlog-scale-tests/400logspersec-5klogentrysize.yaml b/test/containerlog-scale-tests/400logspersec-5klogentrysize.yaml new file mode 100644 index 000000000..42188631a --- /dev/null +++ b/test/containerlog-scale-tests/400logspersec-5klogentrysize.yaml @@ -0,0 +1,60 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: logs-400persec-5kentrysize +spec: + parallelism: 1 + completions: 1 + template: + metadata: + name: logs-400persec-5kentrysize + spec: + volumes: + - name: logs-400persec-5kentrysize-scripts-volume + configMap: + name: logs-400persec-5kentrysize-test-scripts + containers: + - name: logs-400persec-5kentrysize + image: ubuntu + volumeMounts: + - mountPath: /logs-400persec-5kentrysize-test-scripts + name: logs-400persec-5kentrysize-scripts-volume + env: + - name: HOME + value: /tmp + command: + - /bin/sh + - -c + - | + echo "scripts in /logs-400persec-5kentrysize-test-scripts" + ls -lh /logs-400persec-5kentrysize-test-scripts + echo "copy scripts to /tmp" + cp /logs-400persec-5kentrysize-test-scripts/*.sh /tmp + echo "apply 'chmod +x' to /tmp/*.sh" + chmod +x /tmp/*.sh + echo "script.sh in /tmp" + ls -lh /tmp + /tmp/script.sh + restartPolicy: Never +--- +apiVersion: v1 +items: +- apiVersion: v1 + data: + script.sh: | + #!/bin/bash + logentry='' + for var in {1..1024..1} + do + logentry="${logentry}Test-" + done + for var in {1..200000..1} + do + echo $(date "+%Y/%m/%d %H:%M:%S.%3N") ${var}: $logentry + done + kind: ConfigMap + metadata: + creationTimestamp: null + name: logs-400persec-5kentrysize-test-scripts +kind: List +metadata: {} From 195365e15cabf453d9c02e2e62a54a4d6ff90cb8 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 15:34:46 -0700 Subject: [PATCH 09/12] forgot to update image version in chart --- kubernetes/omsagent.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 01d755f0f..abede9448 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -368,7 +368,7 @@ spec: value: "3" containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod04222021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" imagePullPolicy: IfNotPresent resources: limits: @@ -446,7 +446,7 @@ spec: timeoutSeconds: 15 #Only in sidecar scraping mode - name: omsagent-prometheus - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod04222021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" imagePullPolicy: IfNotPresent resources: limits: @@ -589,7 +589,7 @@ spec: serviceAccountName: omsagent containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod04222021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" imagePullPolicy: IfNotPresent resources: limits: From dd7ddef9d0dfe1ee3db61c5c999928c0f5ac53a5 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 15:44:00 -0700 Subject: [PATCH 10/12] fixing windows tag in dockerfile, changing release notes wording --- ReleaseNotes.md | 2 +- kubernetes/windows/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ee45d3ef2..8284ecfd2 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -17,7 +17,7 @@ Note : The agent version(s) below has dates (ciprod), which indicate t ##### Version microsoft/oms:win-ciprod05122021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05122021 (windows) ##### Code change log - Upgrading oneagent to version 1.8 (only for Linux) -- Enabling oneagent for East US 2 +- Enabling oneagent for container logs for East US 2 ### 04/22/2021 - ##### Version microsoft/oms:ciprod04222021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod04222021 (linux) diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile index e57afab7c..fefd089a8 100644 --- a/kubernetes/windows/Dockerfile +++ b/kubernetes/windows/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER OMSContainers@microsoft.com LABEL vendor=Microsoft\ Corp \ com.microsoft.product="Azure Monitor for containers" -ARG IMAGE_TAG=win-ciprod05122021 +ARG IMAGE_TAG=win-ciprod04222021 # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement From a839869c5bdd25167ef84f0221f4860ad8e93d28 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 15:45:32 -0700 Subject: [PATCH 11/12] missed windows tag in one more place --- ReleaseNotes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 8284ecfd2..979eb968b 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -14,7 +14,7 @@ Note : The agent version(s) below has dates (ciprod), which indicate t ### 05/12/2021 - ##### Version microsoft/oms:ciprod00512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod00512021 (linux) -##### Version microsoft/oms:win-ciprod05122021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05122021 (windows) +##### No Windows changes with this release, win-ciprod04222021 still current. ##### Code change log - Upgrading oneagent to version 1.8 (only for Linux) - Enabling oneagent for container logs for East US 2 From 84e7979247a371602f423a8e3d690243f50845dd Mon Sep 17 00:00:00 2001 From: David Michelman Date: Wed, 12 May 2021 15:48:55 -0700 Subject: [PATCH 12/12] forgot to change the windows dockerProviderVersion back --- kubernetes/omsagent.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index abede9448..bf94490ba 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -750,7 +750,7 @@ spec: tier: node-win annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.1.0-0" + dockerProviderVersion: "15.0.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent