From 2e736c5e21291cc4a64ce6eb4f2db0ec50de023d Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Tue, 23 Jan 2024 20:09:57 +0000 Subject: [PATCH 1/8] feat: add AKS log collector to image build --- .../artifacts/aks-log-collector-send.py | 46 ++ .../artifacts/aks-log-collector.service | 8 + .../cloud-init/artifacts/aks-log-collector.sh | 228 ++++++++++ .../artifacts/aks-log-collector.slice | 13 + .../artifacts/aks-log-collector.timer | 10 + pkg/templates/templates_generated.go | 404 ++++++++++++++++++ vhdbuilder/packer/packer_source.sh | 28 ++ vhdbuilder/packer/pre-install-dependencies.sh | 4 + .../packer/vhd-image-builder-arm64-gen2.json | 25 ++ vhdbuilder/packer/vhd-image-builder-base.json | 25 ++ .../vhd-image-builder-mariner-arm64.json | 25 ++ .../packer/vhd-image-builder-mariner.json | 25 ++ 12 files changed, 841 insertions(+) create mode 100644 parts/linux/cloud-init/artifacts/aks-log-collector-send.py create mode 100644 parts/linux/cloud-init/artifacts/aks-log-collector.service create mode 100644 parts/linux/cloud-init/artifacts/aks-log-collector.sh create mode 100644 parts/linux/cloud-init/artifacts/aks-log-collector.slice create mode 100644 parts/linux/cloud-init/artifacts/aks-log-collector.timer diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector-send.py b/parts/linux/cloud-init/artifacts/aks-log-collector-send.py new file mode 100644 index 00000000000..69f1a4f621a --- /dev/null +++ b/parts/linux/cloud-init/artifacts/aks-log-collector-send.py @@ -0,0 +1,46 @@ +#! /usr/bin/env python3 + +import urllib3 +import uuid +import xml.etree.ElementTree as ET + +http = urllib3.PoolManager() + +# Get the container_id and deployment_id from the Goal State +goal_state_xml = http.request( + 'GET', + 'http://168.63.129.16/machine/?comp=goalstate', + headers={ + 'x-ms-version': '2012-11-30' + } + ) +goal_state = ET.fromstring(goal_state_xml.data.decode('utf-8')) +container_id = goal_state.findall('./Container/ContainerId')[0].text +role_config_name = goal_state.findall('./Container/RoleInstanceList/RoleInstance/Configuration/ConfigName')[0].text +deployment_id = role_config_name.split('.')[0] + +# Upload the logs +with open('/var/lib/waagent/logcollector/logs.zip', 'rb') as logs: + logs_data = logs.read() + upload_logs = http.request( + 'PUT', + 'http://168.63.129.16:32526/vmAgentLog', + headers={ + 'x-ms-version': '2015-09-01', + 'x-ms-client-correlationid': str(uuid.uuid4()), + 'x-ms-client-name': 'AKSCSEPlugin', + 'x-ms-client-version': '0.1.0', + 'x-ms-containerid': container_id, + 'x-ms-vmagentlog-deploymentid': deployment_id, + }, + body=logs_data, + ) + +if upload_logs.status == 200: + print("Successfully uploaded logs") + exit(0) +else: + print('Failed to upload logs') + print(f'Response status: {upload_logs.status}') + print(f'Response body:\n{upload_logs.data.decode("utf-8")}') + exit(1) \ No newline at end of file diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.service b/parts/linux/cloud-init/artifacts/aks-log-collector.service new file mode 100644 index 00000000000..9ce9d0d65a2 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.service @@ -0,0 +1,8 @@ +[Unit] +Description=AKS Log Collector + +[Service] +Type=oneshot +Slice=aks-log-collector.slice +ExecStart=/opt/azure/containers/aks-log-collector.sh +RemainAfterExit=no diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.sh b/parts/linux/cloud-init/artifacts/aks-log-collector.sh new file mode 100644 index 00000000000..e37f25f6f82 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.sh @@ -0,0 +1,228 @@ +#! /bin/bash +# +# AKS Log Collector +# +# This script collects information and logs that are useful to AKS engineering +# for support and uploads them to the Azure host via a private API. These log +# bundles are available to engineering when customers open a support case and +# are especially useful for troubleshooting failures of networking or +# kubernetes daemons. +# +# This script runs via a systemd unit and slice that limits it to low CPU +# priority and 128MB RAM, to avoid impacting other system functions. + +# Log bundle upload max size is limited to 100MB +MAX_SIZE=104857600 + +# Shell options - remove non-matching globs, don't care about case, and use +# extended pattern matching +shopt -s nullglob nocaseglob extglob + +# Create a temporary directory to store results in +WORKDIR="$(mktemp -d)" +# check if tmp dir was created +if [[ ! "$WORKDIR" || "$WORKDIR" == "/" || "$WORKDIR" == "/tmp" || ! -d "$WORKDIR" ]]; then + echo "ERROR: Could not create temporary working directory." + exit 1 +fi +cd $WORKDIR +echo "Created temporary directory: $WORKDIR" + +# Function to clean up the output directory and log termination +function cleanup { + # Make sure WORKDIR is a proper temp directory so we don't rm something we shouldn't + if [[ $WORKDIR =~ ^/tmp/tmp\.[a-zA-Z0-9]+$ ]]; then + if [[ "$DEBUG" != "1" ]]; then + echo "Cleaning up $WORKDIR..." + rm -rf "$WORKDIR" + else + echo "DEBUG active or $WORKDIR looks wrong; leaving $WORKDIR behind." + fi + else + echo "ERROR: WORKDIR ($WORKDIR) doesn't look like a proper mktemp directory; not removing it for safety reasons!" + exit 255 + fi + echo "Log collection finished." +} + +# Execute the cleanup function if the script terminates +trap "exit 1" HUP INT PIPE QUIT TERM +trap "cleanup" EXIT + +# Collect general system information +echo "Collecting system information..." +mkdir collect collect/proc collect/proc/net + +# Include some disk listings +find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 + +# Collect system information +dpkg -l >collect/dpkg.txt 2>&1 +lsblk >collect/diskinfo.txt 2>&1 +blkid >>collect/diskinfo.txt 2>&1 +lscpu >collect/lscpu.txt 2>&1 +lscpu -J >collect/lscpu.json 2>&1 +lshw >collect/lshw.txt 2>&1 +lshw -json >collect/lshw.json 2>&1 +lsipc >collect/lsipc.txt 2>&1 +lsns -J --output-all >collect/lsns.json 2>&1 +lspci -vkPP >collect/lspci.txt 2>&1 +lsscsi -vv >collect/lsscsi.txt 2>&1 +lsvmbus -vv >collect/lsvmbus.txt 2>&1 +sysctl -a >collect/sysctl.txt 2>&1 +systemctl status --all -fr >collect/systemctl-status.txt 2>&1 + +# Collect container runtime information +crictl version >collect/crictl_version.txt 2>&1 +crictl info -o json >collect/crictl_info.json 2>&1 +crictl images -o json >collect/crictl_images.json 2>&1 +crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 +crictl pods -o json >collect/crictl_pods.json 2>&1 +crictl ps -o json >collect/crictl_ps.json 2>&1 +crictl stats -o json >collect/crictl_stats.json 2>&1 +crictl statsp -o json >collect/crictl_statsp.json 2>&1 + +# Collect network information +conntrack -L >collect/conntrack.txt 2>&1 +conntrack -S >>collect/conntrack.txt 2>&1 +ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 +ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 +ip -4 -d -j route show >collect/ip_4_route.json 2>&1 +ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 +ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 +ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 +ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 +ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 +ip -d -j link show >collect/ip_link.json 2>&1 +ip -d -j netconf show >collect/ip_netconf.json 2>&1 +ip -d -j netns show >collect/ip_netns.json 2>&1 +ip -d -j rule show >collect/ip_rule.json 2>&1 +iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 +ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 +nft -jn list ruleset >collect/nftables.json 2>&1 +ss -anoempiO --cgroup >collect/ss.txt 2>&1 +ss -s >>collect/ss.txt 2>&1 + +# Collect network information from network namespaces +ip -all netns exec /bin/bash -x -c " + conntrack -L 2>&1; + conntrack -S 2>&1; + ip -4 -d -j addr show 2>&1; + ip -4 -d -j neighbor show 2>&1; + ip -4 -d -j route show 2>&1; + ip -4 -d -j tcpmetrics show 2>&1; + ip -6 -d -j addr show table all 2>&1; + ip -6 -d -j neighbor show 2>&1; + ip -6 -d -j route show table all 2>&1; + ip -6 -d -j tcpmetrics show 2>&1; + ip -d -j link show 2>&1; + ip -d -j netconf show 2>&1; + ip -d -j netns show 2>&1; + ip -d -j rule show 2>&1; + iptables -L -vn --line-numbers 2>&1; + ip6tables -L -vn --line-numbers 2>&1; + nft -jn list ruleset 2>&1; + ss -anoempiO --cgroup 2>&1; + ss -s 2>&1; +" >collect/ip_netns_commands.txt 2>&1 + +# Collect general information +cp /proc/@(cmdline|cpuinfo|filesystems|interrupts|loadavg|meminfo|modules|mounts|slabinfo|stat|uptime|version*|vmstat) collect/proc/ +cp -r /proc/net/* collect/proc/net/ + +# Include collected information in zip +zip -DZ deflate -r aks_logs.zip collect/* + +# File globs to include +# Smaller and more critical files are closer to the top so that we can be certain they're included. +declare -a GLOBS + +# AKS specific entries +GLOBS+=(/etc/cni/net.d/*) +GLOBS+=(/etc/containerd/*) +GLOBS+=(/etc/default/kubelet) +GLOBS+=(/etc/kubernetes/manifests/*) +GLOBS+=(/var/lib/kubelet/kubeconfig) + +# based on MANIFEST_FULL from Azure Linux Agent's log collector +# https://github.com/Azure/WALinuxAgent/blob/master/azurelinuxagent/common/logcollector_manifests.py +GLOBS+=(/var/lib/waagent/provisioned) +GLOBS+=(/etc/fstab) +GLOBS+=(/etc/ssh/sshd_config) +GLOBS+=(/boot/grub*/grub.c*) +GLOBS+=(/boot/grub*/menu.lst) +GLOBS+=(/etc/*-release) +GLOBS+=(/etc/HOSTNAME) +GLOBS+=(/etc/hostname) +GLOBS+=(/etc/apt/sources.list) +GLOBS+=(/etc/apt/sources.list.d/*) +GLOBS+=(/etc/network/interfaces) +GLOBS+=(/etc/network/interfaces.d/*.cfg) +GLOBS+=(/etc/netplan/*.yaml) +GLOBS+=(/etc/nsswitch.conf) +GLOBS+=(/etc/resolv.conf) +GLOBS+=(/run/systemd/resolve/stub-resolv.conf) +GLOBS+=(/run/resolvconf/resolv.conf) +GLOBS+=(/etc/sysconfig/iptables) +GLOBS+=(/etc/sysconfig/network) +GLOBS+=(/etc/sysconfig/network/ifcfg-eth*) +GLOBS+=(/etc/sysconfig/network/routes) +GLOBS+=(/etc/sysconfig/network-scripts/ifcfg-eth*) +GLOBS+=(/etc/sysconfig/network-scripts/route-eth*) +GLOBS+=(/etc/ufw/ufw.conf) +GLOBS+=(/etc/waagent.conf) +GLOBS+=(/var/lib/hyperv/.kvp_pool_*) +GLOBS+=(/var/lib/dhcp/dhclient.eth0.leases) +GLOBS+=(/var/lib/dhclient/dhclient-eth0.leases) +GLOBS+=(/var/lib/wicked/lease-eth0-dhcp-ipv4.xml) +GLOBS+=(/var/log/azure/custom-script/handler.log) +GLOBS+=(/var/log/azure/run-command/handler.log) +GLOBS+=(/var/lib/waagent/ovf-env.xml) +GLOBS+=(/var/lib/waagent/*/status/*.status) +GLOBS+=(/var/lib/waagent/*/config/*.settings) +GLOBS+=(/var/lib/waagent/*/config/HandlerState) +GLOBS+=(/var/lib/waagent/*/config/HandlerStatus) +GLOBS+=(/var/lib/waagent/SharedConfig.xml) +GLOBS+=(/var/lib/waagent/ManagedIdentity-*.json) +GLOBS+=(/var/lib/waagent/waagent_status.json) +GLOBS+=(/var/lib/waagent/*/error.json) +GLOBS+=(/var/log/cloud-init*) +GLOBS+=(/var/log/azure/*/*) +GLOBS+=(/var/log/azure/*/*/*) +GLOBS+=(/var/log/syslog*) +GLOBS+=(/var/log/rsyslog*) +GLOBS+=(/var/log/messages*) +GLOBS+=(/var/log/kern*) +GLOBS+=(/var/log/dmesg*) +GLOBS+=(/var/log/dpkg*) +GLOBS+=(/var/log/yum*) +GLOBS+=(/var/log/boot*) +GLOBS+=(/var/log/auth*) +GLOBS+=(/var/log/secure*) + +# Add each file sequentially to the zip archive. This is slightly less efficient then adding them +# all at once, but allows us to easily check when we've exceeded the maximum file size and stop +# adding things to the archive. +echo "Adding log files to zip archive..." +for file in ${GLOBS[*]}; do + if test -e $file; then + zip -DZ deflate -u aks_logs.zip $file + + # The API for the log bundle has a max file size (defined above, usually 100MB), so if + # adding this last file made the zip go over that size, remove that file and stop processing. + FILE_SIZE=$(stat --printf "%s" aks_logs.zip) + if [ $FILE_SIZE -ge $MAX_SIZE ]; then + echo "WARNING: ZIP file size $FILE_SIZE >= $MAX_SIZE; removing last log file and terminating adding more files." + zip -d aks_logs.zip $file + break + fi + fi +done + +# Copy the log bundle to the expected path for uploading, then trigger +# the upload script to push it to the host storage location. +echo "Log bundle size: $(du -hs aks_logs.zip)" +mkdir -p /var/lib/waagent/logcollector +cp aks_logs.zip /var/lib/waagent/logcollector/logs.zip +echo -n "Uploading log bundle: " +/usr/bin/env python3 /opt/azure/containers/aks-log-collector-send.py diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.slice b/parts/linux/cloud-init/artifacts/aks-log-collector.slice new file mode 100644 index 00000000000..42ddd912e27 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.slice @@ -0,0 +1,13 @@ +[Unit] +Description=AKS Log Collector Slice +DefaultDependencies=no +Before=slices.target +Requires=system.slice +After=system.slice + +[Slice] +CPUAccounting=true +#CPUQuota=10% +CPUShares=100 +CPUWeight=1 +MemoryMax=128M diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.timer b/parts/linux/cloud-init/artifacts/aks-log-collector.timer new file mode 100644 index 00000000000..8f08ef53963 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.timer @@ -0,0 +1,10 @@ +[Unit] +Description=AKS Log Collector Timer + +[Timer] +OnActiveSec=0m +OnBootSec=5min +OnUnitActiveSec=60m + +[Install] +WantedBy=timers.target diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 95b80b11276..c90642194ff 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -6,6 +6,11 @@ // linux/cloud-init/artifacts/10-containerd.conf // linux/cloud-init/artifacts/10-httpproxy.conf // linux/cloud-init/artifacts/10-tlsbootstrap.conf +// linux/cloud-init/artifacts/aks-log-collector-send.py +// linux/cloud-init/artifacts/aks-log-collector.service +// linux/cloud-init/artifacts/aks-log-collector.sh +// linux/cloud-init/artifacts/aks-log-collector.slice +// linux/cloud-init/artifacts/aks-log-collector.timer // linux/cloud-init/artifacts/aks-logrotate-override.conf // linux/cloud-init/artifacts/aks-logrotate.service // linux/cloud-init/artifacts/aks-logrotate.sh @@ -260,6 +265,395 @@ func linuxCloudInitArtifacts10TlsbootstrapConf() (*asset, error) { return a, nil } +var _linuxCloudInitArtifactsAksLogCollectorSendPy = []byte(`#! /usr/bin/env python3 + +import urllib3 +import uuid +import xml.etree.ElementTree as ET + +http = urllib3.PoolManager() + +# Get the container_id and deployment_id from the Goal State +goal_state_xml = http.request( + 'GET', + 'http://168.63.129.16/machine/?comp=goalstate', + headers={ + 'x-ms-version': '2012-11-30' + } + ) +goal_state = ET.fromstring(goal_state_xml.data.decode('utf-8')) +container_id = goal_state.findall('./Container/ContainerId')[0].text +role_config_name = goal_state.findall('./Container/RoleInstanceList/RoleInstance/Configuration/ConfigName')[0].text +deployment_id = role_config_name.split('.')[0] + +# Upload the logs +with open('/var/lib/waagent/logcollector/logs.zip', 'rb') as logs: + logs_data = logs.read() + upload_logs = http.request( + 'PUT', + 'http://168.63.129.16:32526/vmAgentLog', + headers={ + 'x-ms-version': '2015-09-01', + 'x-ms-client-correlationid': str(uuid.uuid4()), + 'x-ms-client-name': 'AKSCSEPlugin', + 'x-ms-client-version': '0.1.0', + 'x-ms-containerid': container_id, + 'x-ms-vmagentlog-deploymentid': deployment_id, + }, + body=logs_data, + ) + +if upload_logs.status == 200: + print("Successfully uploaded logs") + exit(0) +else: + print('Failed to upload logs') + print(f'Response status: {upload_logs.status}') + print(f'Response body:\n{upload_logs.data.decode("utf-8")}') + exit(1)`) + +func linuxCloudInitArtifactsAksLogCollectorSendPyBytes() ([]byte, error) { + return _linuxCloudInitArtifactsAksLogCollectorSendPy, nil +} + +func linuxCloudInitArtifactsAksLogCollectorSendPy() (*asset, error) { + bytes, err := linuxCloudInitArtifactsAksLogCollectorSendPyBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/aks-log-collector-send.py", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsAksLogCollectorService = []byte(`[Unit] +Description=AKS Log Collector + +[Service] +Type=oneshot +Slice=aks-log-collector.slice +ExecStart=/opt/azure/containers/aks-log-collector.sh +RemainAfterExit=no +`) + +func linuxCloudInitArtifactsAksLogCollectorServiceBytes() ([]byte, error) { + return _linuxCloudInitArtifactsAksLogCollectorService, nil +} + +func linuxCloudInitArtifactsAksLogCollectorService() (*asset, error) { + bytes, err := linuxCloudInitArtifactsAksLogCollectorServiceBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/aks-log-collector.service", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsAksLogCollectorSh = []byte(`#! /bin/bash +# +# AKS Log Collector +# +# This script collects information and logs that are useful to AKS engineering +# for support and uploads them to the Azure host via a private API. These log +# bundles are available to engineering when customers open a support case and +# are especially useful for troubleshooting failures of networking or +# kubernetes daemons. +# +# This script runs via a systemd unit and slice that limits it to low CPU +# priority and 128MB RAM, to avoid impacting other system functions. + +# Log bundle upload max size is limited to 100MB +MAX_SIZE=104857600 + +# Shell options - remove non-matching globs, don't care about case, and use +# extended pattern matching +shopt -s nullglob nocaseglob extglob + +# Create a temporary directory to store results in +WORKDIR="$(mktemp -d)" +# check if tmp dir was created +if [[ ! "$WORKDIR" || "$WORKDIR" == "/" || "$WORKDIR" == "/tmp" || ! -d "$WORKDIR" ]]; then + echo "ERROR: Could not create temporary working directory." + exit 1 +fi +cd $WORKDIR +echo "Created temporary directory: $WORKDIR" + +# Function to clean up the output directory and log termination +function cleanup { + # Make sure WORKDIR is a proper temp directory so we don't rm something we shouldn't + if [[ $WORKDIR =~ ^/tmp/tmp\.[a-zA-Z0-9]+$ ]]; then + if [[ "$DEBUG" != "1" ]]; then + echo "Cleaning up $WORKDIR..." + rm -rf "$WORKDIR" + else + echo "DEBUG active or $WORKDIR looks wrong; leaving $WORKDIR behind." + fi + else + echo "ERROR: WORKDIR ($WORKDIR) doesn't look like a proper mktemp directory; not removing it for safety reasons!" + exit 255 + fi + echo "Log collection finished." +} + +# Execute the cleanup function if the script terminates +trap "exit 1" HUP INT PIPE QUIT TERM +trap "cleanup" EXIT + +# Collect general system information +echo "Collecting system information..." +mkdir collect collect/proc collect/proc/net + +# Include some disk listings +find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 + +# Collect system information +dpkg -l >collect/dpkg.txt 2>&1 +lsblk >collect/diskinfo.txt 2>&1 +blkid >>collect/diskinfo.txt 2>&1 +lscpu >collect/lscpu.txt 2>&1 +lscpu -J >collect/lscpu.json 2>&1 +lshw >collect/lshw.txt 2>&1 +lshw -json >collect/lshw.json 2>&1 +lsipc >collect/lsipc.txt 2>&1 +lsns -J --output-all >collect/lsns.json 2>&1 +lspci -vkPP >collect/lspci.txt 2>&1 +lsscsi -vv >collect/lsscsi.txt 2>&1 +lsvmbus -vv >collect/lsvmbus.txt 2>&1 +sysctl -a >collect/sysctl.txt 2>&1 +systemctl status --all -fr >collect/systemctl-status.txt 2>&1 + +# Collect container runtime information +crictl version >collect/crictl_version.txt 2>&1 +crictl info -o json >collect/crictl_info.json 2>&1 +crictl images -o json >collect/crictl_images.json 2>&1 +crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 +crictl pods -o json >collect/crictl_pods.json 2>&1 +crictl ps -o json >collect/crictl_ps.json 2>&1 +crictl stats -o json >collect/crictl_stats.json 2>&1 +crictl statsp -o json >collect/crictl_statsp.json 2>&1 + +# Collect network information +conntrack -L >collect/conntrack.txt 2>&1 +conntrack -S >>collect/conntrack.txt 2>&1 +ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 +ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 +ip -4 -d -j route show >collect/ip_4_route.json 2>&1 +ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 +ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 +ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 +ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 +ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 +ip -d -j link show >collect/ip_link.json 2>&1 +ip -d -j netconf show >collect/ip_netconf.json 2>&1 +ip -d -j netns show >collect/ip_netns.json 2>&1 +ip -d -j rule show >collect/ip_rule.json 2>&1 +iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 +ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 +nft -jn list ruleset >collect/nftables.json 2>&1 +ss -anoempiO --cgroup >collect/ss.txt 2>&1 +ss -s >>collect/ss.txt 2>&1 + +# Collect network information from network namespaces +ip -all netns exec /bin/bash -x -c " + conntrack -L 2>&1; + conntrack -S 2>&1; + ip -4 -d -j addr show 2>&1; + ip -4 -d -j neighbor show 2>&1; + ip -4 -d -j route show 2>&1; + ip -4 -d -j tcpmetrics show 2>&1; + ip -6 -d -j addr show table all 2>&1; + ip -6 -d -j neighbor show 2>&1; + ip -6 -d -j route show table all 2>&1; + ip -6 -d -j tcpmetrics show 2>&1; + ip -d -j link show 2>&1; + ip -d -j netconf show 2>&1; + ip -d -j netns show 2>&1; + ip -d -j rule show 2>&1; + iptables -L -vn --line-numbers 2>&1; + ip6tables -L -vn --line-numbers 2>&1; + nft -jn list ruleset 2>&1; + ss -anoempiO --cgroup 2>&1; + ss -s 2>&1; +" >collect/ip_netns_commands.txt 2>&1 + +# Collect general information +cp /proc/@(cmdline|cpuinfo|filesystems|interrupts|loadavg|meminfo|modules|mounts|slabinfo|stat|uptime|version*|vmstat) collect/proc/ +cp -r /proc/net/* collect/proc/net/ + +# Include collected information in zip +zip -DZ deflate -r aks_logs.zip collect/* + +# File globs to include +# Smaller and more critical files are closer to the top so that we can be certain they're included. +declare -a GLOBS + +# AKS specific entries +GLOBS+=(/etc/cni/net.d/*) +GLOBS+=(/etc/containerd/*) +GLOBS+=(/etc/default/kubelet) +GLOBS+=(/etc/kubernetes/manifests/*) +GLOBS+=(/var/lib/kubelet/kubeconfig) + +# based on MANIFEST_FULL from Azure Linux Agent's log collector +# https://github.com/Azure/WALinuxAgent/blob/master/azurelinuxagent/common/logcollector_manifests.py +GLOBS+=(/var/lib/waagent/provisioned) +GLOBS+=(/etc/fstab) +GLOBS+=(/etc/ssh/sshd_config) +GLOBS+=(/boot/grub*/grub.c*) +GLOBS+=(/boot/grub*/menu.lst) +GLOBS+=(/etc/*-release) +GLOBS+=(/etc/HOSTNAME) +GLOBS+=(/etc/hostname) +GLOBS+=(/etc/apt/sources.list) +GLOBS+=(/etc/apt/sources.list.d/*) +GLOBS+=(/etc/network/interfaces) +GLOBS+=(/etc/network/interfaces.d/*.cfg) +GLOBS+=(/etc/netplan/*.yaml) +GLOBS+=(/etc/nsswitch.conf) +GLOBS+=(/etc/resolv.conf) +GLOBS+=(/run/systemd/resolve/stub-resolv.conf) +GLOBS+=(/run/resolvconf/resolv.conf) +GLOBS+=(/etc/sysconfig/iptables) +GLOBS+=(/etc/sysconfig/network) +GLOBS+=(/etc/sysconfig/network/ifcfg-eth*) +GLOBS+=(/etc/sysconfig/network/routes) +GLOBS+=(/etc/sysconfig/network-scripts/ifcfg-eth*) +GLOBS+=(/etc/sysconfig/network-scripts/route-eth*) +GLOBS+=(/etc/ufw/ufw.conf) +GLOBS+=(/etc/waagent.conf) +GLOBS+=(/var/lib/hyperv/.kvp_pool_*) +GLOBS+=(/var/lib/dhcp/dhclient.eth0.leases) +GLOBS+=(/var/lib/dhclient/dhclient-eth0.leases) +GLOBS+=(/var/lib/wicked/lease-eth0-dhcp-ipv4.xml) +GLOBS+=(/var/log/azure/custom-script/handler.log) +GLOBS+=(/var/log/azure/run-command/handler.log) +GLOBS+=(/var/lib/waagent/ovf-env.xml) +GLOBS+=(/var/lib/waagent/*/status/*.status) +GLOBS+=(/var/lib/waagent/*/config/*.settings) +GLOBS+=(/var/lib/waagent/*/config/HandlerState) +GLOBS+=(/var/lib/waagent/*/config/HandlerStatus) +GLOBS+=(/var/lib/waagent/SharedConfig.xml) +GLOBS+=(/var/lib/waagent/ManagedIdentity-*.json) +GLOBS+=(/var/lib/waagent/waagent_status.json) +GLOBS+=(/var/lib/waagent/*/error.json) +GLOBS+=(/var/log/cloud-init*) +GLOBS+=(/var/log/azure/*/*) +GLOBS+=(/var/log/azure/*/*/*) +GLOBS+=(/var/log/syslog*) +GLOBS+=(/var/log/rsyslog*) +GLOBS+=(/var/log/messages*) +GLOBS+=(/var/log/kern*) +GLOBS+=(/var/log/dmesg*) +GLOBS+=(/var/log/dpkg*) +GLOBS+=(/var/log/yum*) +GLOBS+=(/var/log/boot*) +GLOBS+=(/var/log/auth*) +GLOBS+=(/var/log/secure*) + +# Add each file sequentially to the zip archive. This is slightly less efficient then adding them +# all at once, but allows us to easily check when we've exceeded the maximum file size and stop +# adding things to the archive. +echo "Adding log files to zip archive..." +for file in ${GLOBS[*]}; do + if test -e $file; then + zip -DZ deflate -u aks_logs.zip $file + + # The API for the log bundle has a max file size (defined above, usually 100MB), so if + # adding this last file made the zip go over that size, remove that file and stop processing. + FILE_SIZE=$(stat --printf "%s" aks_logs.zip) + if [ $FILE_SIZE -ge $MAX_SIZE ]; then + echo "WARNING: ZIP file size $FILE_SIZE >= $MAX_SIZE; removing last log file and terminating adding more files." + zip -d aks_logs.zip $file + break + fi + fi +done + +# Copy the log bundle to the expected path for uploading, then trigger +# the upload script to push it to the host storage location. +echo "Log bundle size: $(du -hs aks_logs.zip)" +mkdir -p /var/lib/waagent/logcollector +cp aks_logs.zip /var/lib/waagent/logcollector/logs.zip +echo -n "Uploading log bundle: " +/usr/bin/env python3 /opt/azure/containers/aks-log-collector-send.py +`) + +func linuxCloudInitArtifactsAksLogCollectorShBytes() ([]byte, error) { + return _linuxCloudInitArtifactsAksLogCollectorSh, nil +} + +func linuxCloudInitArtifactsAksLogCollectorSh() (*asset, error) { + bytes, err := linuxCloudInitArtifactsAksLogCollectorShBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/aks-log-collector.sh", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsAksLogCollectorSlice = []byte(`[Unit] +Description=AKS Log Collector Slice +DefaultDependencies=no +Before=slices.target +Requires=system.slice +After=system.slice + +[Slice] +CPUAccounting=true +#CPUQuota=10% +CPUShares=100 +CPUWeight=1 +MemoryMax=128M +`) + +func linuxCloudInitArtifactsAksLogCollectorSliceBytes() ([]byte, error) { + return _linuxCloudInitArtifactsAksLogCollectorSlice, nil +} + +func linuxCloudInitArtifactsAksLogCollectorSlice() (*asset, error) { + bytes, err := linuxCloudInitArtifactsAksLogCollectorSliceBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/aks-log-collector.slice", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsAksLogCollectorTimer = []byte(`[Unit] +Description=AKS Log Collector Timer + +[Timer] +OnActiveSec=0m +OnBootSec=5min +OnUnitActiveSec=60m + +[Install] +WantedBy=timers.target +`) + +func linuxCloudInitArtifactsAksLogCollectorTimerBytes() ([]byte, error) { + return _linuxCloudInitArtifactsAksLogCollectorTimer, nil +} + +func linuxCloudInitArtifactsAksLogCollectorTimer() (*asset, error) { + bytes, err := linuxCloudInitArtifactsAksLogCollectorTimerBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/aks-log-collector.timer", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _linuxCloudInitArtifactsAksLogrotateOverrideConf = []byte(`[Timer] OnCalendar= OnCalendar=*-*-* *:00:00`) @@ -8328,6 +8722,11 @@ var _bindata = map[string]func() (*asset, error){ "linux/cloud-init/artifacts/10-containerd.conf": linuxCloudInitArtifacts10ContainerdConf, "linux/cloud-init/artifacts/10-httpproxy.conf": linuxCloudInitArtifacts10HttpproxyConf, "linux/cloud-init/artifacts/10-tlsbootstrap.conf": linuxCloudInitArtifacts10TlsbootstrapConf, + "linux/cloud-init/artifacts/aks-log-collector-send.py": linuxCloudInitArtifactsAksLogCollectorSendPy, + "linux/cloud-init/artifacts/aks-log-collector.service": linuxCloudInitArtifactsAksLogCollectorService, + "linux/cloud-init/artifacts/aks-log-collector.sh": linuxCloudInitArtifactsAksLogCollectorSh, + "linux/cloud-init/artifacts/aks-log-collector.slice": linuxCloudInitArtifactsAksLogCollectorSlice, + "linux/cloud-init/artifacts/aks-log-collector.timer": linuxCloudInitArtifactsAksLogCollectorTimer, "linux/cloud-init/artifacts/aks-logrotate-override.conf": linuxCloudInitArtifactsAksLogrotateOverrideConf, "linux/cloud-init/artifacts/aks-logrotate.service": linuxCloudInitArtifactsAksLogrotateService, "linux/cloud-init/artifacts/aks-logrotate.sh": linuxCloudInitArtifactsAksLogrotateSh, @@ -8467,6 +8866,11 @@ var _bintree = &bintree{nil, map[string]*bintree{ "10-containerd.conf": &bintree{linuxCloudInitArtifacts10ContainerdConf, map[string]*bintree{}}, "10-httpproxy.conf": &bintree{linuxCloudInitArtifacts10HttpproxyConf, map[string]*bintree{}}, "10-tlsbootstrap.conf": &bintree{linuxCloudInitArtifacts10TlsbootstrapConf, map[string]*bintree{}}, + "aks-log-collector-send.py": &bintree{linuxCloudInitArtifactsAksLogCollectorSendPy, map[string]*bintree{}}, + "aks-log-collector.service": &bintree{linuxCloudInitArtifactsAksLogCollectorService, map[string]*bintree{}}, + "aks-log-collector.sh": &bintree{linuxCloudInitArtifactsAksLogCollectorSh, map[string]*bintree{}}, + "aks-log-collector.slice": &bintree{linuxCloudInitArtifactsAksLogCollectorSlice, map[string]*bintree{}}, + "aks-log-collector.timer": &bintree{linuxCloudInitArtifactsAksLogCollectorTimer, map[string]*bintree{}}, "aks-logrotate-override.conf": &bintree{linuxCloudInitArtifactsAksLogrotateOverrideConf, map[string]*bintree{}}, "aks-logrotate.service": &bintree{linuxCloudInitArtifactsAksLogrotateService, map[string]*bintree{}}, "aks-logrotate.sh": &bintree{linuxCloudInitArtifactsAksLogrotateSh, map[string]*bintree{}}, diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh index 81c715a1020..20cdc0afe1d 100644 --- a/vhdbuilder/packer/packer_source.sh +++ b/vhdbuilder/packer/packer_source.sh @@ -79,6 +79,16 @@ copyPackerFiles() { CI_SYSLOG_WATCHER_SERVICE_DEST=/etc/systemd/system/ci-syslog-watcher.service CI_SYSLOG_WATCHER_SCRIPT_SRC=/home/packer/ci-syslog-watcher.sh CI_SYSLOG_WATCHER_SCRIPT_DEST=/usr/local/bin/ci-syslog-watcher.sh + AKS_LOG_COLLECTOR_SCRIPT_SRC=/home/packer/aks-log-collector.sh + AKS_LOG_COLLECTOR_SCRIPT_DEST=/opt/azure/containers/aks-log-collector.sh + AKS_LOG_COLLECTOR_SEND_SCRIPT_SRC=/home/packer/aks-log-collector-send.py + AKS_LOG_COLLECTOR_SEND_SCRIPT_DEST=/opt/azure/containers/aks-log-collector-send.py + AKS_LOG_COLLECTOR_SERVICE_SRC=/home/packer/aks-log-collector.service + AKS_LOG_COLLECTOR_SERVICE_DEST=/etc/systemd/system/aks-log-collector.service + AKS_LOG_COLLECTOR_SLICE_SRC=/home/packer/aks-log-collector.slice + AKS_LOG_COLLECTOR_SLICE_DEST=/etc/systemd/system/aks-log-collector.slice + AKS_LOG_COLLECTOR_TIMER_SRC=/home/packer/aks-log-collector.timer + AKS_LOG_COLLECTOR_TIMER_DEST=/etc/systemd/system/aks-log-collector.timer AKS_LOGROTATE_SCRIPT_SRC=/home/packer/logrotate.sh AKS_LOGROTATE_SCRIPT_DEST=/usr/local/bin/logrotate.sh AKS_LOGROTATE_SERVICE_SRC=/home/packer/logrotate.service @@ -233,6 +243,24 @@ copyPackerFiles() { SSHD_CONFIG_SRC=/home/packer/sshd_config_1804_fips fi + AKS_LOG_COLLECTOR_SCRIPT_SRC=/home/packer/aks-log-collector.sh + AKS_LOG_COLLECTOR_SCRIPT_DEST=/opt/azure/containers/aks-log-collector.sh + AKS_LOG_COLLECTOR_SEND_SCRIPT_SRC=/home/packer/aks-log-collector-send.py + AKS_LOG_COLLECTOR_SEND_SCRIPT_DEST=/opt/azure/containers/aks-log-collector-send.py + AKS_LOG_COLLECTOR_SERVICE_SRC=/home/packer/aks-log-collector.service + AKS_LOG_COLLECTOR_SERVICE_DEST=/etc/systemd/system/aks-log-collector.service + AKS_LOG_COLLECTOR_SLICE_SRC=/home/packer/aks-log-collector.slice + AKS_LOG_COLLECTOR_SLICE_DEST=/etc/systemd/system/aks-log-collector.slice + AKS_LOG_COLLECTOR_TIMER_SRC=/home/packer/aks-log-collector.timer + AKS_LOG_COLLECTOR_TIMER_DEST=/etc/systemd/system/aks-log-collector.timer + + # Install AKS log collector + cpAndMode $AKS_LOG_COLLECTOR_SCRIPT_SRC $AKS_LOG_COLLECTOR_SCRIPT_DEST 755 + cpAndMode $AKS_LOG_COLLECTOR_SEND_SCRIPT_SRC $AKS_LOG_COLLECTOR_SEND_SCRIPT_DEST 755 + cpAndMode $AKS_LOG_COLLECTOR_SERVICE_SRC $AKS_LOG_COLLECTOR_SERVICE_DEST 644 + cpAndMode $AKS_LOG_COLLECTOR_SLICE_SRC $AKS_LOG_COLLECTOR_SLICE_DEST 644 + cpAndMode $AKS_LOG_COLLECTOR_TIMER_SRC $AKS_LOG_COLLECTOR_TIMER_DEST 644 + cpAndMode $AKS_LOGROTATE_CONF_SRC $AKS_LOGROTATE_CONF_DEST 644 # If a logrotation timer does not exist on the base image if [ ! -f /etc/systemd/system/logrotate.timer ] && [ ! -f /usr/lib/systemd/system/logrotate.timer ]; then diff --git a/vhdbuilder/packer/pre-install-dependencies.sh b/vhdbuilder/packer/pre-install-dependencies.sh index 71eccbd24b7..b11852da296 100644 --- a/vhdbuilder/packer/pre-install-dependencies.sh +++ b/vhdbuilder/packer/pre-install-dependencies.sh @@ -42,6 +42,10 @@ systemctlEnableAndStart update_certs.path || exit 1 systemctlEnableAndStart ci-syslog-watcher.path || exit 1 systemctlEnableAndStart ci-syslog-watcher.service || exit 1 +# enable AKS log collector +echo -e "\n# Disable WALA log collection because AKS Log Collector is installed.\nLogs.Collect=n" >> /etc/waagent.conf || exit 1 +systemctlEnableAndStart aks-log-collector.timer || exit 1 + # enable the modified logrotate service and remove the auto-generated default logrotate cron job if present systemctlEnableAndStart logrotate.timer || exit 1 rm -f /etc/cron.daily/logrotate diff --git a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json index 3439f47a85d..8de39c02d7f 100644 --- a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json +++ b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json @@ -431,6 +431,31 @@ "source": "parts/linux/cloud-init/artifacts/ci-syslog-watcher.sh", "destination": "/home/packer/ci-syslog-watcher.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.sh", + "destination": "/home/packer/aks-log-collector.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector-send.py", + "destination": "/home/packer/aks-log-collector-send.py" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.service", + "destination": "/home/packer/aks-log-collector.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.slice", + "destination": "/home/packer/aks-log-collector.slice" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.timer", + "destination": "/home/packer/aks-log-collector.timer" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/aks-logrotate.sh", diff --git a/vhdbuilder/packer/vhd-image-builder-base.json b/vhdbuilder/packer/vhd-image-builder-base.json index 3d66c98f284..1c59ad49707 100644 --- a/vhdbuilder/packer/vhd-image-builder-base.json +++ b/vhdbuilder/packer/vhd-image-builder-base.json @@ -441,6 +441,31 @@ "source": "parts/linux/cloud-init/artifacts/ci-syslog-watcher.sh", "destination": "/home/packer/ci-syslog-watcher.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.sh", + "destination": "/home/packer/aks-log-collector.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector-send.py", + "destination": "/home/packer/aks-log-collector-send.py" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.service", + "destination": "/home/packer/aks-log-collector.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.slice", + "destination": "/home/packer/aks-log-collector.slice" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.timer", + "destination": "/home/packer/aks-log-collector.timer" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/aks-logrotate.sh", diff --git a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json index 49248696444..a82e0cddf7c 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json @@ -409,6 +409,31 @@ "source": "parts/linux/cloud-init/artifacts/ci-syslog-watcher.sh", "destination": "/home/packer/ci-syslog-watcher.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.sh", + "destination": "/home/packer/aks-log-collector.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector-send.py", + "destination": "/home/packer/aks-log-collector-send.py" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.service", + "destination": "/home/packer/aks-log-collector.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.slice", + "destination": "/home/packer/aks-log-collector.slice" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.timer", + "destination": "/home/packer/aks-log-collector.timer" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/aks-logrotate.sh", diff --git a/vhdbuilder/packer/vhd-image-builder-mariner.json b/vhdbuilder/packer/vhd-image-builder-mariner.json index 4290cb18845..bb2e55fc4c0 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner.json @@ -416,6 +416,31 @@ "source": "parts/linux/cloud-init/artifacts/ci-syslog-watcher.sh", "destination": "/home/packer/ci-syslog-watcher.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.sh", + "destination": "/home/packer/aks-log-collector.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector-send.py", + "destination": "/home/packer/aks-log-collector-send.py" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.service", + "destination": "/home/packer/aks-log-collector.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.slice", + "destination": "/home/packer/aks-log-collector.slice" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/aks-log-collector.timer", + "destination": "/home/packer/aks-log-collector.timer" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/aks-logrotate.sh", From f3e18c6fc4aebffb621926c2e12d1c7d97d225bf Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Tue, 23 Jan 2024 22:05:10 +0000 Subject: [PATCH 2/8] feat: remove duplicated variable declarations --- vhdbuilder/packer/packer_source.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh index 20cdc0afe1d..4e89a9b9929 100644 --- a/vhdbuilder/packer/packer_source.sh +++ b/vhdbuilder/packer/packer_source.sh @@ -243,17 +243,6 @@ copyPackerFiles() { SSHD_CONFIG_SRC=/home/packer/sshd_config_1804_fips fi - AKS_LOG_COLLECTOR_SCRIPT_SRC=/home/packer/aks-log-collector.sh - AKS_LOG_COLLECTOR_SCRIPT_DEST=/opt/azure/containers/aks-log-collector.sh - AKS_LOG_COLLECTOR_SEND_SCRIPT_SRC=/home/packer/aks-log-collector-send.py - AKS_LOG_COLLECTOR_SEND_SCRIPT_DEST=/opt/azure/containers/aks-log-collector-send.py - AKS_LOG_COLLECTOR_SERVICE_SRC=/home/packer/aks-log-collector.service - AKS_LOG_COLLECTOR_SERVICE_DEST=/etc/systemd/system/aks-log-collector.service - AKS_LOG_COLLECTOR_SLICE_SRC=/home/packer/aks-log-collector.slice - AKS_LOG_COLLECTOR_SLICE_DEST=/etc/systemd/system/aks-log-collector.slice - AKS_LOG_COLLECTOR_TIMER_SRC=/home/packer/aks-log-collector.timer - AKS_LOG_COLLECTOR_TIMER_DEST=/etc/systemd/system/aks-log-collector.timer - # Install AKS log collector cpAndMode $AKS_LOG_COLLECTOR_SCRIPT_SRC $AKS_LOG_COLLECTOR_SCRIPT_DEST 755 cpAndMode $AKS_LOG_COLLECTOR_SEND_SCRIPT_SRC $AKS_LOG_COLLECTOR_SEND_SCRIPT_DEST 755 From 17dbe7814a6d58c6f8b7a1c349a78e95647b6ef9 Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Wed, 24 Jan 2024 15:32:38 +0000 Subject: [PATCH 3/8] feat: Update CSE scripts to call AKS log collector --- parts/linux/cloud-init/artifacts/cse_start.sh | 14 +++++++++----- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh | 5 ++--- .../AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../AKSUbuntu1604+DynamicKubeletConfig/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line26.sh | 5 ++--- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh | 5 ++--- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh | 5 ++--- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh | 5 ++--- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line26.sh | 5 ++--- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh | 5 ++--- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line26.sh | 5 ++--- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line26.sh | 5 ++--- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line26.sh | 5 ++--- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../AKSUbuntu1804+Containerd+NSeriesSku/line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../AKSUbuntu1804+Containerd+PrivateACR/line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line26.sh | 5 ++--- .../AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd+runcshimv2/line26.sh | 5 ++--- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../testdata/AKSUbuntu1804+CustomCATrust/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line26.sh | 5 ++--- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line26.sh | 5 ++--- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh | 5 ++--- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../AKSUbuntu1804Containerd+RuncVersion/line26.sh | 5 ++--- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line26.sh | 5 ++--- .../testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../testdata/AKSUbuntu2204+CustomCloud/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOff/line26.sh | 5 ++--- .../testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOn/line26.sh | 5 ++--- .../AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../AKSUbuntu2204+SecureTLSBoostrapping/line26.sh | 5 ++--- .../CustomData | 2 +- .../line26.sh | 5 ++--- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line26.sh | 5 ++--- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line26.sh | 5 ++--- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- .../CustomData | 2 +- .../line25.sh | 5 ++--- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line26.sh | 5 ++--- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line26.sh | 5 ++--- pkg/templates/templates_generated.go | 14 +++++++++----- 138 files changed, 222 insertions(+), 282 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/cse_start.sh b/parts/linux/cloud-init/artifacts/cse_start.sh index 6e5eea936d0..d39651605f6 100644 --- a/parts/linux/cloud-init/artifacts/cse_start.sh +++ b/parts/linux/cloud-init/artifacts/cse_start.sh @@ -81,11 +81,15 @@ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json # the VM before it finishes. if we succeeded, upload in the background # so that the provisioning script returns success more quickly upload_logs() { - # find the most recent version of WALinuxAgent and use it to collect logs per - # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + # Commenting out 2024-01-24 due to AKS Log Collector addition; will be uncommented when WALA has full cgroup v2 support. + # # find the most recent version of WALinuxAgent and use it to collect logs per + # # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs + # PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + # python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + # python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + # Call AKS Log Collector + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 876dbd41708..0a339ab7910 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index c31ae1208a6..9b479cbe371 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index c31ae1208a6..9b479cbe371 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 6d7f380c7d7..9ae342bc22e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 6d7f380c7d7..9ae342bc22e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 876dbd41708..0a339ab7910 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 8b4e5c8c83b..aa811fec198 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 903d79631f3..645b5c74016 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 876dbd41708..0a339ab7910 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 37fe449473f..42a5d8503ef 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 876dbd41708..0a339ab7910 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index f1a02d6d9a5..0bd10d28433 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 2071faa2242..3adba2edf80 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index f1a02d6d9a5..0bd10d28433 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 5160323ab21..f49fd66c369 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 57b726e0f8a..25eef9f06f2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 5693a21276d..d83017b40d4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index c5817cce7b3..a2ca5336461 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 116523e3f82..be0d1531108 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 57b726e0f8a..25eef9f06f2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 57b726e0f8a..25eef9f06f2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 9b4317cde02..1c38f9ebc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAaVpzxmCF/NvG7X4GI/DdbtesrmHm6Z56enqcbB6Zum1Z/Zlmjid6T2i7iWBZyo/bldDbpW5Y+TObhg3hyCSdW5+TcEGWBe2tMQw7q6hODs09r0O49ot0j9gAa3XAN/QwDrDmUcOQRHDBtE9BHj3mUdNgDXFyA9ogCzafLPdIPGceBeoD5dAkfL/46E/TvI8seTId6T/qnwF4Yx2uH+6CqhKobtMQBqD4wjnjIYBXeYx/z9yygOgyrNOSbkB/Wms6tm7nVk9oceT6oDpyfnp6C+J7NirJwrc8MfZwL7WG/7IE+gbqBaxwQ7FveGjOO1ht4A4ZdUDGAyLTCZE/TliK8vQEPQlz2Xz4k1QVRei3itmLu9EAWBuPpfDgyRtZ4Oug37tjxaeiqHvG46lMH+REF/Rk7E+QRk6OAVzARmVYNKfCp20Udrzp8A7/3UfsjpH6Bz7uoXI6M9xzVwiN/6JQKGzjKqoAvUzN069t0dj1sIrV7dVWC+RMNVu7vZFZev45TGVlmczXXTcvuX+lGY9Y9Id8j4TNaYsI7DAePnoN/J6nKbdTxqgSXqV3PP+tjPYHY1bwS6f0TlMrL1ypfCVlPZqb3h7dFb2LWXfsHDQOC/LjchGlxeYNlgDdgUBfPMHJf4A2cqBS6LWiBujhTz+X8orIomLempU+GtjmfTPqz2zR8rooI8l9+4sx9M3VbN4bvqcL6V92wTHs8vboaGVf2cDTrFUrVxHMCyuiCd/rRe0d/5phEJYt1BiHjdG06gbfhGn7EhDNt7/FyNNZto592B/DhhJ2cG7Kgf9cHc2s0NezhfNaPHnpSGzsPFKR2+4CVQYVsJHO9hRgjZFkWhH+ZU8M2rdnIuOpJbfjxP1AJ3AlQ+qkqCpaAHRCltB8QG5B0A6K0q+ZNMByA2DjvxgsWOTeZrBiIUrECNxk4UQXyoyDVlLejxlnbd5otsjYFoW4yJBG7sho2rsVwOQPq4UsEolSpS01WLNpX4ZI1nlJyl0WpLBnVdq1X/dnjA+riLkjYUWAa945dkOhGAT0IaBBNBEose8MwQNyjJBpylaTpS0WuC9KKKTCICvaIeHwcdVbZ2V1OZBClyWTuMqr2ucmFAkZSK7PjJFrP1HNQhhW4CjHj/agYZaeWSAFzJ1BmuF6j4KULEmMKfKaUDxFHG+oRzrrwWkftl5a63p1GzklyQNttC2RhvXK9ICopBXlDKybs1CejJPAGHOMKaOYj5AejRBDWmDG0xDbjgUeWWQXaZUn55pfzQpRey7CtmPGRyFXZNO8jgWVM6/v9nGk9LOPreK8NTS12s8+GLVa3uc3uahtNaOovK302tXiZEDbBMt6O9FZ7b0dg2RNu6GyyJ9wAq/BW1dmUnVWhYmc5pUvzUgH9ox4PFJO9St7qc7JJ9o5nX40kNqZYnVQeT6RqKW1KljqVO5ISlRLYdOqpQdyBFgwqz38bySLdKV1LkMvat9PR/HDSq7eYdnenacvW4f2/nbt25+87uSNpd2daSxZ2raMd6XCxldtl5+EDYK8L1X84bcWc2XSDd6V05B7MSv1xwegrDiKZ3yf9WefjeR5gIbYy0BongP612RmYesdhEXMU8Dxaj7rjMX7EfrL1uF32o4HCwpNd+A63LR/PbYXfG89N0KcVs1Z5tvWahrILUvqsZEPVBSnzpuwD0gUpeVLSEEQ+kkclwzS66umLsifWBSl5UtLd75E3nqukm94PWp67jdJtl12vhyTZwsX+PfcFs00H04+QbVKuw41PkWv7dMnaMrzGwbi5tb5MjZu+9aUntRcecZO6791rTyj+yAaVRAf9rT+Ovrvjm3n3dwcv4+SmAQc1+Apv8ICRCyo5k2O3mxf+QMk5SAf/oDrU97HD1WgDoC5C34cLzcWPGoke4z8Qs7ZH/gi1GSY7Mp3NS8nRVvAW8O+M/oJKMJzCf/4B/AGTeKFMPATsM1wchL+EhScI+NnjGUf/DwAA//+Vu/Ij/hUAAA== + H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 4f38757c9bd..6e422bb9403 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 5aab869a7ad..2110f3ea56c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAaVpzxmCF/NvG7X4GI/DdbtesrmHm6Z56enqcbB6Zum1Z/Zlmjid6T2i7iWBZyo/bldDbpW5Y+TObhg3hyCSdW5+TcEGWBe2tMQw7q6hODs09r0O49ot0j9gAa3XAN/QwDrDmUcOQRHDBtE9BHj3mUdNgDXFyA9ogCzafLPdIPGceBeoD5dAkfL/46E/TvI8seTId6T/qnwF4Yx2uH+6CqhKobtMQBqD4wjnjIYBXeYx/z9yygOgyrNOSbkB/Wms6tm7nVk9oceT6oDpyfnp6C+J7NirJwrc8MfZwL7WG/7IE+gbqBaxwQ7FveGjOO1ht4A4ZdUDGAyLTCZE/TliK8vQEPQlz2Xz4k1QVRei3itmLu9EAWBuPpfDgyRtZ4Oug37tjxaeiqHvG46lMH+REF/Rk7E+QRk6OAVzARmVYNKfCp20Udrzp8A7/3UfsjpH6Bz7uoXI6M9xzVwiN/6JQKGzjKqoAvUzN069t0dj1sIrV7dVWC+RMNVu7vZFZev45TGVlmczXXTcvuX+lGY9Y9Id8j4TNaYsI7DAePnoN/J6nKbdTxqgSXqV3PP+tjPYHY1bwS6f0TlMrL1ypfCVlPZqb3h7dFb2LWXfsHDQOC/LjchGlxeYNlgDdgUBfPMHJf4A2cqBS6LWiBujhTz+X8orIomLempU+GtjmfTPqz2zR8rooI8l9+4sx9M3VbN4bvqcL6V92wTHs8vboaGVf2cDTrFUrVxHMCyuiCd/rRe0d/5phEJYt1BiHjdG06gbfhGn7EhDNt7/FyNNZto592B/DhhJ2cG7Kgf9cHc2s0NezhfNaPHnpSGzsPFKR2+4CVQYVsJHO9hRgjZFkWhH+ZU8M2rdnIuOpJbfjxP1AJ3AlQ+qkqCpaAHRCltB8QG5B0A6K0q+ZNMByA2DjvxgsWOTeZrBiIUrECNxk4UQXyoyDVlLejxlnbd5otsjYFoW4yJBG7sho2rsVwOQPq4UsEolSpS01WLNpX4ZI1nlJyl0WpLBnVdq1X/dnjA+riLkjYUWAa945dkOhGAT0IaBBNBEose8MwQNyjJBpylaTpS0WuC9KKKTCICvaIeHwcdVbZ2V1OZBClyWTuMqr2ucmFAkZSK7PjJFrP1HNQhhW4CjHj/agYZaeWSAFzJ1BmuF6j4KULEmMKfKaUDxFHG+oRzrrwWkftl5a63p1GzklyQNttC2RhvXK9ICopBXlDKybs1CejJPAGHOMKaOYj5AejRBDWmDG0xDbjgUeWWQXaZUn55pfzQpRey7CtmPGRyFXZNO8jgWVM6/v9nGk9LOPreK8NTS12s8+GLVa3uc3uahtNaOovK302tXiZEDbBMt6O9FZ7b0dg2RNu6GyyJ9wAq/BW1dmUnVWhYmc5pUvzUgH9ox4PFJO9St7qc7JJ9o5nX40kNqZYnVQeT6RqKW1KljqVO5ISlRLYdOqpQdyBFgwqz38bySLdKV1LkMvat9PR/HDSq7eYdnenacvW4f2/nbt25+87uSNpd2daSxZ2raMd6XCxldtl5+EDYK8L1X84bcWc2XSDd6V05B7MSv1xwegrDiKZ3yf9WefjeR5gIbYy0BongP612RmYesdhEXMU8Dxaj7rjMX7EfrL1uF32o4HCwpNd+A63LR/PbYXfG89N0KcVs1Z5tvWahrILUvqsZEPVBSnzpuwD0gUpeVLSEEQ+kkclwzS66umLsifWBSl5UtLd75E3nqukm94PWp67jdJtl12vhyTZwsX+PfcFs00H04+QbVKuw41PkWv7dMnaMrzGwbi5tb5MjZu+9aUntRcecZO6791rTyj+yAaVRAf9rT+Ovrvjm3n3dwcv4+SmAQc1+Apv8ICRCyo5k2O3mxf+QMk5SAf/oDrU97HD1WgDoC5C34cLzcWPGoke4z8Qs7ZH/gi1GSY7Mp3NS8nRVvAW8O+M/oJKMJzCf/4B/AGTeKFMPATsM1wchL+EhScI+NnjGUf/DwAA//+Vu/Ij/hUAAA== + H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 5160323ab21..f49fd66c369 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 5693a21276d..d83017b40d4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 4b1229b1c03..b3a1c89ed2c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index df5dc140fa0..e9cd02bb2e3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index fcf4b3f075c..0bae20f87a3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index c1bd778dd34..6dc3d2288d6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index ee6f0861692..5d729f48ce8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 5072895117e..b2c9e58aca7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index c3b26d57878..8939b7194f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 213ac36a399..5e44a9ff6b1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index c1bd778dd34..6dc3d2288d6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index c1bd778dd34..6dc3d2288d6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 05f2cd16e01..fa45c01c3ea 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index e0442107f47..e96baa84fd7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 5160323ab21..f49fd66c369 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index c1bd778dd34..6dc3d2288d6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAaVpzxmCF/NvG7X4GI/DdbtesrmHm6Z56enqcbB6Zum1Z/Zlmjid6T2i7iWBZyo/bldDbpW5Y+TObhg3hyCSdW5+TcEGWBe2tMQw7q6hODs09r0O49ot0j9gAa3XAN/QwDrDmUcOQRHDBtE9BHj3mUdNgDXFyA9ogCzafLPdIPGceBeoD5dAkfL/46E/TvI8seTId6T/qnwF4Yx2uH+6CqhKobtMQBqD4wjnjIYBXeYx/z9yygOgyrNOSbkB/Wms6tm7nVk9oceT6oDpyfnp6C+J7NirJwrc8MfZwL7WG/7IE+gbqBaxwQ7FveGjOO1ht4A4ZdUDGAyLTCZE/TliK8vQEPQlz2Xz4k1QVRei3itmLu9EAWBuPpfDgyRtZ4Oug37tjxaeiqHvG46lMH+REF/Rk7E+QRk6OAVzARmVYNKfCp20Udrzp8A7/3UfsjpH6Bz7uoXI6M9xzVwiN/6JQKGzjKqoAvUzN069t0dj1sIrV7dVWC+RMNVu7vZFZev45TGVlmczXXTcvuX+lGY9Y9Id8j4TNaYsI7DAePnoN/J6nKbdTxqgSXqV3PP+tjPYHY1bwS6f0TlMrL1ypfCVlPZqb3h7dFb2LWXfsHDQOC/LjchGlxeYNlgDdgUBfPMHJf4A2cqBS6LWiBujhTz+X8orIomLempU+GtjmfTPqz2zR8rooI8l9+4sx9M3VbN4bvqcL6V92wTHs8vboaGVf2cDTrFUrVxHMCyuiCd/rRe0d/5phEJYt1BiHjdG06gbfhGn7EhDNt7/FyNNZto592B/DhhJ2cG7Kgf9cHc2s0NezhfNaPHnpSGzsPFKR2+4CVQYVsJHO9hRgjZFkWhH+ZU8M2rdnIuOpJbfjxP1AJ3AlQ+qkqCpaAHRCltB8QG5B0A6K0q+ZNMByA2DjvxgsWOTeZrBiIUrECNxk4UQXyoyDVlLejxlnbd5otsjYFoW4yJBG7sho2rsVwOQPq4UsEolSpS01WLNpX4ZI1nlJyl0WpLBnVdq1X/dnjA+riLkjYUWAa945dkOhGAT0IaBBNBEose8MwQNyjJBpylaTpS0WuC9KKKTCICvaIeHwcdVbZ2V1OZBClyWTuMqr2ucmFAkZSK7PjJFrP1HNQhhW4CjHj/agYZaeWSAFzJ1BmuF6j4KULEmMKfKaUDxFHG+oRzrrwWkftl5a63p1GzklyQNttC2RhvXK9ICopBXlDKybs1CejJPAGHOMKaOYj5AejRBDWmDG0xDbjgUeWWQXaZUn55pfzQpRey7CtmPGRyFXZNO8jgWVM6/v9nGk9LOPreK8NTS12s8+GLVa3uc3uahtNaOovK302tXiZEDbBMt6O9FZ7b0dg2RNu6GyyJ9wAq/BW1dmUnVWhYmc5pUvzUgH9ox4PFJO9St7qc7JJ9o5nX40kNqZYnVQeT6RqKW1KljqVO5ISlRLYdOqpQdyBFgwqz38bySLdKV1LkMvat9PR/HDSq7eYdnenacvW4f2/nbt25+87uSNpd2daSxZ2raMd6XCxldtl5+EDYK8L1X84bcWc2XSDd6V05B7MSv1xwegrDiKZ3yf9WefjeR5gIbYy0BongP612RmYesdhEXMU8Dxaj7rjMX7EfrL1uF32o4HCwpNd+A63LR/PbYXfG89N0KcVs1Z5tvWahrILUvqsZEPVBSnzpuwD0gUpeVLSEEQ+kkclwzS66umLsifWBSl5UtLd75E3nqukm94PWp67jdJtl12vhyTZwsX+PfcFs00H04+QbVKuw41PkWv7dMnaMrzGwbi5tb5MjZu+9aUntRcecZO6791rTyj+yAaVRAf9rT+Ovrvjm3n3dwcv4+SmAQc1+Apv8ICRCyo5k2O3mxf+QMk5SAf/oDrU97HD1WgDoC5C34cLzcWPGoke4z8Qs7ZH/gi1GSY7Mp3NS8nRVvAW8O+M/oJKMJzCf/4B/AGTeKFMPATsM1wchL+EhScI+NnjGUf/DwAA//+Vu/Ij/hUAAA== + H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index e08a5c89807..3c02e76b5f2 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index e08a5c89807..3c02e76b5f2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index e08a5c89807..3c02e76b5f2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index e08a5c89807..3c02e76b5f2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index e08a5c89807..3c02e76b5f2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 6387c0901c8..9b3ea2b4078 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAaVpzxmCF/NvG7X4GI/DdbtesrmHm6Z56enqcbB6Zum1Z/Zlmjid6T2i7iWBZyo/bldDbpW5Y+TObhg3hyCSdW5+TcEGWBe2tMQw7q6hODs09r0O49ot0j9gAa3XAN/QwDrDmUcOQRHDBtE9BHj3mUdNgDXFyA9ogCzafLPdIPGceBeoD5dAkfL/46E/TvI8seTId6T/qnwF4Yx2uH+6CqhKobtMQBqD4wjnjIYBXeYx/z9yygOgyrNOSbkB/Wms6tm7nVk9oceT6oDpyfnp6C+J7NirJwrc8MfZwL7WG/7IE+gbqBaxwQ7FveGjOO1ht4A4ZdUDGAyLTCZE/TliK8vQEPQlz2Xz4k1QVRei3itmLu9EAWBuPpfDgyRtZ4Oug37tjxaeiqHvG46lMH+REF/Rk7E+QRk6OAVzARmVYNKfCp20Udrzp8A7/3UfsjpH6Bz7uoXI6M9xzVwiN/6JQKGzjKqoAvUzN069t0dj1sIrV7dVWC+RMNVu7vZFZev45TGVlmczXXTcvuX+lGY9Y9Id8j4TNaYsI7DAePnoN/J6nKbdTxqgSXqV3PP+tjPYHY1bwS6f0TlMrL1ypfCVlPZqb3h7dFb2LWXfsHDQOC/LjchGlxeYNlgDdgUBfPMHJf4A2cqBS6LWiBujhTz+X8orIomLempU+GtjmfTPqz2zR8rooI8l9+4sx9M3VbN4bvqcL6V92wTHs8vboaGVf2cDTrFUrVxHMCyuiCd/rRe0d/5phEJYt1BiHjdG06gbfhGn7EhDNt7/FyNNZto592B/DhhJ2cG7Kgf9cHc2s0NezhfNaPHnpSGzsPFKR2+4CVQYVsJHO9hRgjZFkWhH+ZU8M2rdnIuOpJbfjxP1AJ3AlQ+qkqCpaAHRCltB8QG5B0A6K0q+ZNMByA2DjvxgsWOTeZrBiIUrECNxk4UQXyoyDVlLejxlnbd5otsjYFoW4yJBG7sho2rsVwOQPq4UsEolSpS01WLNpX4ZI1nlJyl0WpLBnVdq1X/dnjA+riLkjYUWAa945dkOhGAT0IaBBNBEose8MwQNyjJBpylaTpS0WuC9KKKTCICvaIeHwcdVbZ2V1OZBClyWTuMqr2ucmFAkZSK7PjJFrP1HNQhhW4CjHj/agYZaeWSAFzJ1BmuF6j4KULEmMKfKaUDxFHG+oRzrrwWkftl5a63p1GzklyQNttC2RhvXK9ICopBXlDKybs1CejJPAGHOMKaOYj5AejRBDWmDG0xDbjgUeWWQXaZUn55pfzQpRey7CtmPGRyFXZNO8jgWVM6/v9nGk9LOPreK8NTS12s8+GLVa3uc3uahtNaOovK302tXiZEDbBMt6O9FZ7b0dg2RNu6GyyJ9wAq/BW1dmUnVWhYmc5pUvzUgH9ox4PFJO9St7qc7JJ9o5nX40kNqZYnVQeT6RqKW1KljqVO5ISlRLYdOqpQdyBFgwqz38bySLdKV1LkMvat9PR/HDSq7eYdnenacvW4f2/nbt25+87uSNpd2daSxZ2raMd6XCxldtl5+EDYK8L1X84bcWc2XSDd6V05B7MSv1xwegrDiKZ3yf9WefjeR5gIbYy0BongP612RmYesdhEXMU8Dxaj7rjMX7EfrL1uF32o4HCwpNd+A63LR/PbYXfG89N0KcVs1Z5tvWahrILUvqsZEPVBSnzpuwD0gUpeVLSEEQ+kkclwzS66umLsifWBSl5UtLd75E3nqukm94PWp67jdJtl12vhyTZwsX+PfcFs00H04+QbVKuw41PkWv7dMnaMrzGwbi5tb5MjZu+9aUntRcecZO6791rTyj+yAaVRAf9rT+Ovrvjm3n3dwcv4+SmAQc1+Apv8ICRCyo5k2O3mxf+QMk5SAf/oDrU97HD1WgDoC5C34cLzcWPGoke4z8Qs7ZH/gi1GSY7Mp3NS8nRVvAW8O+M/oJKMJzCf/4B/AGTeKFMPATsM1wchL+EhScI+NnjGUf/DwAA//+Vu/Ij/hUAAA== + H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line25.sh b/pkg/agent/testdata/MarinerV2+Kata/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line25.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 6387c0901c8..9b3ea2b4078 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 6387c0901c8..9b3ea2b4078 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 6387c0901c8..9b3ea2b4078 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 6387c0901c8..9b3ea2b4078 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 876dbd41708..0a339ab7910 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntu/line26.sh b/pkg/agent/testdata/RawUbuntu/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/RawUbuntu/line26.sh +++ b/pkg/agent/testdata/RawUbuntu/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 72d5edbc01d..3fc9e7a1825 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line26.sh b/pkg/agent/testdata/RawUbuntuContainerd/line26.sh index 67946447025..c75d16fb009 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line26.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line26.sh @@ -72,9 +72,8 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index c90642194ff..1c71bfb7176 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -4308,11 +4308,15 @@ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json # the VM before it finishes. if we succeeded, upload in the background # so that the provisioning script returns success more quickly upload_logs() { - # find the most recent version of WALinuxAgent and use it to collect logs per - # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs - PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + # Commenting out 2024-01-24 due to AKS Log Collector addition; will be uncommented when WALA has full cgroup v2 support. + # # find the most recent version of WALinuxAgent and use it to collect logs per + # # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs + # PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + # python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + # python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + + # Call AKS Log Collector + /opt/azure/containers/aks-log-collector.sh } if [ $EXIT_CODE -ne 0 ]; then upload_logs From 123ccf8776bab5683c9265bc0003bcfaf4e81f0b Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Wed, 24 Jan 2024 17:15:57 +0000 Subject: [PATCH 4/8] feat: put CSE log call into an if to work with older images --- parts/linux/cloud-init/artifacts/cse_start.sh | 21 +++++++++++-------- .../AKSUbuntu1604+Containerd/CustomData | 2 +- .../AKSUbuntu1604+Containerd/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line26.sh | 9 ++++++-- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line26.sh | 9 ++++++-- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line26.sh | 9 ++++++-- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line26.sh | 9 ++++++-- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line26.sh | 9 ++++++-- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line26.sh | 9 ++++++-- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line26.sh | 9 ++++++-- .../AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../AKSUbuntu1804+HTTPProxy/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line26.sh | 9 ++++++-- .../AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line26.sh | 9 ++++++-- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line26.sh | 9 ++++++-- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../CustomData | 2 +- .../line26.sh | 9 ++++++-- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line26.sh | 9 ++++++-- .../AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line26.sh | 9 ++++++-- .../testdata/AzureLinuxV2+Kata/CustomData | 2 +- .../testdata/AzureLinuxV2+Kata/line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- .../CustomData | 2 +- .../line25.sh | 9 ++++++-- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line26.sh | 9 ++++++-- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line26.sh | 9 ++++++-- pkg/templates/templates_generated.go | 21 +++++++++++-------- 138 files changed, 568 insertions(+), 222 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/cse_start.sh b/parts/linux/cloud-init/artifacts/cse_start.sh index d39651605f6..a9f28acaebf 100644 --- a/parts/linux/cloud-init/artifacts/cse_start.sh +++ b/parts/linux/cloud-init/artifacts/cse_start.sh @@ -81,15 +81,18 @@ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json # the VM before it finishes. if we succeeded, upload in the background # so that the provisioning script returns success more quickly upload_logs() { - # Commenting out 2024-01-24 due to AKS Log Collector addition; will be uncommented when WALA has full cgroup v2 support. - # # find the most recent version of WALinuxAgent and use it to collect logs per - # # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs - # PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - # python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - # python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 - - # Call AKS Log Collector - /opt/azure/containers/aks-log-collector.sh + # if the VHD has the AKS log collector installed, use it instead. Otherwise + # fall back to WALA collector + if test -x /opt/azure/containers/aks-log-collector.sh; then + # Call AKS Log Collector + /opt/azure/containers/aks-log-collector.sh + else + # find the most recent version of WALinuxAgent and use it to collect logs per + # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 0a339ab7910..c44212174de 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 9b479cbe371..00918467d17 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 9b479cbe371..00918467d17 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 9ae342bc22e..303231a5775 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 9ae342bc22e..303231a5775 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 0a339ab7910..c44212174de 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index aa811fec198..5e9b9cc2334 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 645b5c74016..ff81cede8d2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 0a339ab7910..c44212174de 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 42a5d8503ef..c5e417ad845 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 0a339ab7910..c44212174de 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 0bd10d28433..3f65442bd86 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 3adba2edf80..4ee3c3a91d8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 0bd10d28433..3f65442bd86 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index f49fd66c369..8ba53dd5d3a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 25eef9f06f2..f1964f2d1e5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index d83017b40d4..e3bfa4c94e2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index a2ca5336461..5eca0d0ec91 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index be0d1531108..f14d5db9aca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 25eef9f06f2..f1964f2d1e5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 25eef9f06f2..f1964f2d1e5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 1c38f9ebc61..2dc70014695 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 6e422bb9403..7f07461c247 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 2110f3ea56c..3dfeca1d636 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index f49fd66c369..8ba53dd5d3a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index d83017b40d4..e3bfa4c94e2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index b3a1c89ed2c..5dd35ea8479 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index e9cd02bb2e3..d2a9ecf75aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 0bae20f87a3..70743b8a6ce 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 6dc3d2288d6..5abea34be84 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 5d729f48ce8..fe6494d0811 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index b2c9e58aca7..0b2cfe2acb4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 8939b7194f8..4332314fb05 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 5e44a9ff6b1..7fe595333ba 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 6dc3d2288d6..5abea34be84 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 6dc3d2288d6..5abea34be84 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index fa45c01c3ea..1aac3b6a29c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index e96baa84fd7..415f7d52f5b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index f49fd66c369..8ba53dd5d3a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 6dc3d2288d6..5abea34be84 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 3c02e76b5f2..c932c4a0de4 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 3c02e76b5f2..c932c4a0de4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 3c02e76b5f2..c932c4a0de4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 3c02e76b5f2..c932c4a0de4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 3c02e76b5f2..c932c4a0de4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/7RY33ObuhJ+56/YYUhtbsEkzfTFd5I7rq1kfGPjjsE97Zycw6igONQY+UgiTZr4fz+DwZjfTmdaP4H07UrfavXt4qGFHMsezG17PEUXStfDgqhSYdS5ms2nA9tGo3Qe3sonV3Bi907OTVmVhL8mNBKgr95zOHu/BuOrHxpfMb8Hg26EgX9EjBguDQX2Q8K4sWH0wec+DXv8Hi4vwXjAzAjoco8MIi4I0w+wgC7h3eWbMwl9HtvOcDZCF8r/JP7EBVm7IgBdD6m+wUvCQA+ACywiDqvoKwmIeM0CusuJTiOxicRhrdnC/riwL5SuwH4Augvnp6enIL9ms7Iq3aC5iSaF0B72y+/pd9A3cENYSALbXxMu8HoDL8CJBzoBkLlRmrwwjKUMLy8gWESq/quHpHsgK89l3FYunB6o0nAyW4zG5tiezIaD1h27AY083Q99oQfUxUFMAT0Sd4r90BKYiRomMjfqISU+Tbto4tWEb+H3Omq/hdRP8HkVlaux+ZqjuvPD33RKpQ0cZVXCV6mZyP5jNr8ZtZFKXj09JOI7ZSvvVzKrrt/EqYqssrleIMt2BtfIbM267zjww+gRL0koepywB98lv5JU7TaaeNWCq9RuFh/QBKUQp55XKr2/g1J1+UblqyCbyczRYPSl7E3Ou+t+oxELcbArN1FWXF5gycgGTOqROcHeE7yAG5dCrwMd0O/O9HO1uKgqS9YXy0bTkWMtptPB/EsWPk/HIQ6efpDcfbOQg8zRa6ow+oRM23Ims+vrsXntjMbzi1Kpmvouo5zeid4gfu+hR0HCuGTx3jDigq4tl/kbYZAHEgpu7D1ejSfIMQdZdwBvT/jJualK6DMaLuzxzHRGi/kgfrhQusS9p6B0uwesCjrkI1noLeQdQlVVSfq/NTMdy56PzesLpQvf/gE9hFsJKj9dx2wJxAVZyfoBuQVJNyArSTVvgxEGcuu8t1uwzLnNZMVBVsoVuM3AjStQEAepobwdNc7bvtLsLm9TEuo2wzBmV1XD1rU4qWZAM3yJQVZqdanNisf7Kl2y1lNK77KsVCWj3q7zjB59MaQe6YNCXA1mu96xDwrdaIAYoyyeYNpO9kYRw8KnYTzkaWnTl4lcH5QV12AYF+xx6ItJ3FnlZ5OcyCEqk+ncVVztC5N3GphprcyPh/F6FipAOdHgOiJcDOJilJ9aYg2sRKCsaL3G7KkPCucafKBUjLDAG+qHgvfhuYnaTy11k5xGwUl6QNttB1RpvfJ8FpeUkrzhFZcS9ckpCbyAIKQGmvsI+cZpKElrwjleEocL5ofLvAIlWVK9+dW8kJXnKmwr53ykclU1LfpIYTnT5n6/YNoMy/k63mtDW4vd7rNli/Vtbru7xkYT2vrLWp9tLV4uhG2wnLcjvdXe2xFY/oRbOpv8CbfAarzVdTZVZ3WonbOC0mV5qQF6h3YD5WSvk7fmnGyTvePZ1yCJrSnWJJXHE6leStuSpUnljqRErQS2nXpmsOtASwa157+NZZEmSteR1Kr2JTpaHE579Q43bm8NY9k5vP/du+32/nOr9hTj9szoqFLSOjqxDpdbuSQ7Dx8Ae12o/8NpKxfMZhuSlNKxdzCr9Mclo0+ExTK/T/qz3rvzIsDGfGXiNUkBgxurN7RQz+Uxc8xEEY3i7nhCHkiQbn3XLgfxQGnhaRK+w20rxnNb4/ej76Xo05pZuzrbec5C2Qcle9byoeqDknvT9gHpg5I+aVkIYh/po5ZjGl/17EXbE+uDkj5p2e73yI++p2Wb3g/avreN0y3JrudDkmzhcv9e+ILZZoPZR8g2LdfRJqDYcwK65F0VnqVdNOr/bsQrrgd0qbs0CIgrKOvxe2kr+XfwZ07TQA8JnMJf/wVxT8Kdu9waEgk4KQ/CG+nOlyTy6Iuco38DAAD//6yzpJxSFQAA + H4sIAAAAAAAA/7RYb3OiThJ+z6fooshP+S1Isql945W5cpVkvSimBHc3dbmjJjAqK854zJA/m/jdr1BE/utW7foKZp7umaen5+nGnqnbptWdWNZgpHekpos4loXMqH09noy6lqX343n4IJ5dw5nVOrs0RFng3grTkIO6/MTg4tMKtEePaI+ILUCja66hn2GANYcSjjyCA6atA/rkMY+SFlvA1RVoTyjQfDrfI/2QcRyoB5hP5/Dx6q8LQf8+sOzeuK93pH8K7JVxvHK4D6pKqLpGcxyA6gPjiIcMluEj9jE/ZQHVYVilIV+H/LDWeGrdTa2O1OTI80F14PL8/BzEUzYrysKtPjH0YSa0h/2yBX0GdQ23OCDYt7wVZhyt1vAODLugYgCRabnJjqbNRXh/Bx6EuOi/eEiqC6L0lsdtxMzpgSz0huNpf2AMrOG4163dsePT0FU94nHVpw7yIwr6C3ZGyCMmRwEvYSIyrRyS41O1iypeVfgafqdR+yOkfoHPSVSuB8YpRzXzyB86pdwGjrLK4YvUDN36Np7c9utI7V5dlWD+TIOl+zuZFdev4lREFtncTHXTsrs3ulGbdc/I90j4guaY8BbDwZPn4N9JqnQbVbxKwUVqt9PP+lCPIXY5r1h6/wSl4vKVyldAVpOZ6N3+fd6bmHbX/EHDgCB/W27CpLi8wzzAazCoiycYua/wDk5UCt0GNECdXaiXcnZRWRTMe9PSR33bnI5G3cl9Ej5XRQT5rz9x6r6Zuq0b/VOqsP5VNyzTHo5vbgbGjd0fTDq5UjXynIAyOuOtbvTe0l84JlHJYq1eyDhdmU7grbmGnzDhTNt7vB4MddvoJt0BfDhjZ5eGLOjf9d7UGowNuz+ddKOHjtTEzoKC1GwesDKokI5kprcQtwhZlgXhX+bYsE1rMjBuOlITfvwPVAIPAhR+qoqCOWAHRCnpB8QaJF2DKO2qeR0MByDWzrvbBfOc60yWDEQpX4HrDJyoAvlRkCrK21HjtO2JZrO0TU6o6wxJxK6ohrVrMVzMgGr4HIEolepSnRWL9pW7ZLWnFN9lUSpKRrld401/8XiPurgNEnYUGG97xzZIdK2AHgQ0iCYCZSt7/TBA3KMkGnKVuOlLRK4N0pIp0IsK9oB4fBh1VunZXU6kEIXJeO46qvaZyZkCRlwr0+MkWs/UM1CGFbgJMePdqBilp+ZIAXMnUGa4WqHgtQ0SYwp8ppT3EUdr6hHO2vBWRe2XlrrdnUbGSXxAm00DZGG1dL0gKik5eUNLJuzUJ6Uk8A4c4xJo6iPkB6NEEFaYMTTHNuOBR+ZpBdplSfHmF/NClN6KsI2Y8hHLVdE06yOGpUyr+/2MaTUs5et4rw11LXa9z5otlre59e4qG02o6y9Lfda1eKkQ1sFS3o70VntvR2DpE67pbNInXAMr8VbW2RSdlaG2zjJKl+SlAvpHfTuQT/YyeavOyTrZO559FZJYm2JVUnk8kcqltC5ZqlTuSEqUSmDdqScG2w40Z1B6/ptIFulO6RqCXNS+nY5mh+NevcG0hwdNmzcO7/9tPTRbfz/ILUl7uNAasrBrHe1Ih/Ot3C47Dx8Ae10o/8NpI2bMxmu8K6UD92BW6I9zRl9xEMn8PukvWh8vswALsaWBVjgGdG/NVs/UWw6LmKOAZ9F61B0P8RP2461v22U/GsgtPNqF73DbsvHclPi989wYfV4yaxVnG29JKNsgJc9KOlRtkFJvyj4gbZDiJyUJQeQjflRSTKOrnrwoe2JtkOInJdn9HnnnuUqy6f2g5bmbKN122fV2SJINXO3fM18wm2Qw+QjZxOU6XPsUubZP56wpw9s2GN4MOGYc1JeKPx7Rkqk+nasO9X3scBq02OIfwBeYJE3e6YZbE+wznNje3VtfxsZd1/rSkZozj7hx3+E9as9o+5EPKokS7Vt3GH33b5Xh4e8Wnm8vFw04qMFXeIcFRi6o5EJOXK9f+YKSS5AOa8B+N9HOGKiz0PfhSnPxk0aix+2fmHn7I3/I2gyTXVBb69dSZzNP2AjeDP6dKgegEgzn8J9UKFPHIyQxSg3CX8LMEwT84vGUo/8HAAD//1pxYrONFgAA - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 9b3ea2b4078..0ceacca17e6 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line25.sh b/pkg/agent/testdata/MarinerV2+Kata/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line25.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 9b3ea2b4078..0ceacca17e6 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 9b3ea2b4078..0ceacca17e6 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 9b3ea2b4078..0ceacca17e6 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 9b3ea2b4078..0ceacca17e6 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -22,7 +22,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line25.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 0a339ab7910..c44212174de 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntu/line26.sh b/pkg/agent/testdata/RawUbuntu/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/RawUbuntu/line26.sh +++ b/pkg/agent/testdata/RawUbuntu/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 3fc9e7a1825..bd364722e1f 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -23,7 +23,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line26.sh b/pkg/agent/testdata/RawUbuntuContainerd/line26.sh index c75d16fb009..371440167ee 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line26.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line26.sh @@ -72,8 +72,13 @@ EVENT_JSON=$( jq -n \ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json upload_logs() { - - /opt/azure/containers/aks-log-collector.sh + if test -x /opt/azure/containers/aks-log-collector.sh; then + /opt/azure/containers/aks-log-collector.sh + else + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 1c71bfb7176..67a50fde706 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -4308,15 +4308,18 @@ echo ${EVENT_JSON} > ${EVENTS_LOGGING_DIR}${EVENTS_FILE_NAME}.json # the VM before it finishes. if we succeeded, upload in the background # so that the provisioning script returns success more quickly upload_logs() { - # Commenting out 2024-01-24 due to AKS Log Collector addition; will be uncommented when WALA has full cgroup v2 support. - # # find the most recent version of WALinuxAgent and use it to collect logs per - # # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs - # PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) - # python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 - # python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 - - # Call AKS Log Collector - /opt/azure/containers/aks-log-collector.sh + # if the VHD has the AKS log collector installed, use it instead. Otherwise + # fall back to WALA collector + if test -x /opt/azure/containers/aks-log-collector.sh; then + # Call AKS Log Collector + /opt/azure/containers/aks-log-collector.sh + else + # find the most recent version of WALinuxAgent and use it to collect logs per + # https://supportability.visualstudio.com/AzureIaaSVM/_wiki/wikis/AzureIaaSVM/495009/Log-Collection_AGEX?anchor=manually-collect-logs + PYTHONPATH=$(find /var/lib/waagent -name WALinuxAgent\*.egg | sort -rV | head -n1) + python3 $PYTHONPATH -collect-logs -full >/dev/null 2>&1 + python3 /opt/azure/containers/provision_send_logs.py >/dev/null 2>&1 + fi } if [ $EXIT_CODE -ne 0 ]; then upload_logs From db05f7c8e5d50fa9d6c4cfca277b2073e7ad7d24 Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Wed, 24 Jan 2024 19:55:32 +0000 Subject: [PATCH 5/8] feat: update aks-log-collector.sh to use command checks --- .../cloud-init/artifacts/aks-log-collector.sh | 148 ++++++++++-------- pkg/templates/templates_generated.go | 148 ++++++++++-------- 2 files changed, 172 insertions(+), 124 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.sh b/parts/linux/cloud-init/artifacts/aks-log-collector.sh index e37f25f6f82..5a2d22d81ff 100644 --- a/parts/linux/cloud-init/artifacts/aks-log-collector.sh +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.sh @@ -18,6 +18,11 @@ MAX_SIZE=104857600 # extended pattern matching shopt -s nullglob nocaseglob extglob +command -v zip >/dev/null || { + echo "Error: zip utility not found. Please install zip." + exit 255 +} + # Create a temporary directory to store results in WORKDIR="$(mktemp -d)" # check if tmp dir was created @@ -54,76 +59,95 @@ echo "Collecting system information..." mkdir collect collect/proc collect/proc/net # Include some disk listings -find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 +command -v find >/dev/null && find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 # Collect system information -dpkg -l >collect/dpkg.txt 2>&1 -lsblk >collect/diskinfo.txt 2>&1 -blkid >>collect/diskinfo.txt 2>&1 -lscpu >collect/lscpu.txt 2>&1 -lscpu -J >collect/lscpu.json 2>&1 -lshw >collect/lshw.txt 2>&1 -lshw -json >collect/lshw.json 2>&1 -lsipc >collect/lsipc.txt 2>&1 -lsns -J --output-all >collect/lsns.json 2>&1 -lspci -vkPP >collect/lspci.txt 2>&1 -lsscsi -vv >collect/lsscsi.txt 2>&1 -lsvmbus -vv >collect/lsvmbus.txt 2>&1 -sysctl -a >collect/sysctl.txt 2>&1 -systemctl status --all -fr >collect/systemctl-status.txt 2>&1 +command -v dpkg >/dev/null && dpkg -l >collect/dpkg.txt 2>&1 +command -v tdnf >/dev/null && tdnf list installed >collect/tdnf.txt 2>&1 +command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 +command -v blkid >/dev/null && blkid >>collect/diskinfo.txt 2>&1 +command -v lscpu >/dev/null && { + lscpu >collect/lscpu.txt 2>&1 + lscpu -J >collect/lscpu.json 2>&1 +} +command -v lshw >/dev/null && { + lshw >collect/lshw.txt 2>&1 + lshw -json >collect/lshw.json 2>&1 +} +command -v lsipc >/dev/null && lsipc >collect/lsipc.txt 2>&1 +command -v lsns >/dev/null && lsns -J --output-all >collect/lsns.json 2>&1 +command -v lspci >/dev/null && lspci -vkPP >collect/lspci.txt 2>&1 +command -v lsscsi >/dev/null && lsscsi -vv >collect/lsscsi.txt 2>&1 +command -v lsvmbus >/dev/null && lsvmbus -vv >collect/lsvmbus.txt 2>&1 +command -v sysctl >/dev/null && sysctl -a >collect/sysctl.txt 2>&1 +command -v systemctl >/dev/null && systemctl status --all -fr >collect/systemctl-status.txt 2>&1 # Collect container runtime information -crictl version >collect/crictl_version.txt 2>&1 -crictl info -o json >collect/crictl_info.json 2>&1 -crictl images -o json >collect/crictl_images.json 2>&1 -crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 -crictl pods -o json >collect/crictl_pods.json 2>&1 -crictl ps -o json >collect/crictl_ps.json 2>&1 -crictl stats -o json >collect/crictl_stats.json 2>&1 -crictl statsp -o json >collect/crictl_statsp.json 2>&1 +command -v crictl >/dev/null && { + crictl version >collect/crictl_version.txt 2>&1 + crictl info -o json >collect/crictl_info.json 2>&1 + crictl images -o json >collect/crictl_images.json 2>&1 + crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 + crictl pods -o json >collect/crictl_pods.json 2>&1 + crictl ps -o json >collect/crictl_ps.json 2>&1 + crictl stats -o json >collect/crictl_stats.json 2>&1 + crictl statsp -o json >collect/crictl_statsp.json 2>&1 +} # Collect network information -conntrack -L >collect/conntrack.txt 2>&1 -conntrack -S >>collect/conntrack.txt 2>&1 -ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 -ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 -ip -4 -d -j route show >collect/ip_4_route.json 2>&1 -ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 -ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 -ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 -ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 -ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 -ip -d -j link show >collect/ip_link.json 2>&1 -ip -d -j netconf show >collect/ip_netconf.json 2>&1 -ip -d -j netns show >collect/ip_netns.json 2>&1 -ip -d -j rule show >collect/ip_rule.json 2>&1 -iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 -ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 -nft -jn list ruleset >collect/nftables.json 2>&1 -ss -anoempiO --cgroup >collect/ss.txt 2>&1 -ss -s >>collect/ss.txt 2>&1 +command -v conntrack >/dev/null && { + conntrack -L >collect/conntrack.txt 2>&1 + conntrack -S >>collect/conntrack.txt 2>&1 +} +command -v ip >/dev/null && { + ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 + ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 + ip -4 -d -j route show >collect/ip_4_route.json 2>&1 + ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 + ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 + ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 + ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 + ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 + ip -d -j link show >collect/ip_link.json 2>&1 + ip -d -j netconf show >collect/ip_netconf.json 2>&1 + ip -d -j netns show >collect/ip_netns.json 2>&1 + ip -d -j rule show >collect/ip_rule.json 2>&1 +} +command -v iptables >/dev/null && iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 +command -v ip6tables >/dev/null && ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 +command -v nft >/dev/null && nft -jn list ruleset >collect/nftables.json 2>&1 +command -v ss >/dev/null && { + ss -anoempiO --cgroup >collect/ss.txt 2>&1 + ss -s >>collect/ss.txt 2>&1 +} # Collect network information from network namespaces -ip -all netns exec /bin/bash -x -c " - conntrack -L 2>&1; - conntrack -S 2>&1; - ip -4 -d -j addr show 2>&1; - ip -4 -d -j neighbor show 2>&1; - ip -4 -d -j route show 2>&1; - ip -4 -d -j tcpmetrics show 2>&1; - ip -6 -d -j addr show table all 2>&1; - ip -6 -d -j neighbor show 2>&1; - ip -6 -d -j route show table all 2>&1; - ip -6 -d -j tcpmetrics show 2>&1; - ip -d -j link show 2>&1; - ip -d -j netconf show 2>&1; - ip -d -j netns show 2>&1; - ip -d -j rule show 2>&1; - iptables -L -vn --line-numbers 2>&1; - ip6tables -L -vn --line-numbers 2>&1; - nft -jn list ruleset 2>&1; - ss -anoempiO --cgroup 2>&1; - ss -s 2>&1; +command -v ip >/dev/null && ip -all netns exec /bin/bash -x -c " + command -v conntrack >/dev/null && { + conntrack -L 2>&1; + conntrack -S 2>&1; + } + command -v ip >/dev/null && { + ip -4 -d -j addr show 2>&1; + ip -4 -d -j neighbor show 2>&1; + ip -4 -d -j route show 2>&1; + ip -4 -d -j tcpmetrics show 2>&1; + ip -6 -d -j addr show table all 2>&1; + ip -6 -d -j neighbor show 2>&1; + ip -6 -d -j route show table all 2>&1; + ip -6 -d -j tcpmetrics show 2>&1; + ip -d -j link show 2>&1; + ip -d -j netconf show 2>&1; + ip -d -j netns show 2>&1; + ip -d -j rule show 2>&1; + } + command -v iptables >/dev/null && iptables -L -vn --line-numbers 2>&1; + command -v ip6tables >/dev/null && ip6tables -L -vn --line-numbers 2>&1; + command -v nft >/dev/null && nft -jn list ruleset 2>&1; + command -v ss >/dev/null && { + ss -anoempiO --cgroup 2>&1; + ss -s 2>&1; + } " >collect/ip_netns_commands.txt 2>&1 # Collect general information diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 67a50fde706..09e2a458f61 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -372,6 +372,11 @@ MAX_SIZE=104857600 # extended pattern matching shopt -s nullglob nocaseglob extglob +command -v zip >/dev/null || { + echo "Error: zip utility not found. Please install zip." + exit 255 +} + # Create a temporary directory to store results in WORKDIR="$(mktemp -d)" # check if tmp dir was created @@ -408,76 +413,95 @@ echo "Collecting system information..." mkdir collect collect/proc collect/proc/net # Include some disk listings -find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 +command -v find >/dev/null && find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 # Collect system information -dpkg -l >collect/dpkg.txt 2>&1 -lsblk >collect/diskinfo.txt 2>&1 -blkid >>collect/diskinfo.txt 2>&1 -lscpu >collect/lscpu.txt 2>&1 -lscpu -J >collect/lscpu.json 2>&1 -lshw >collect/lshw.txt 2>&1 -lshw -json >collect/lshw.json 2>&1 -lsipc >collect/lsipc.txt 2>&1 -lsns -J --output-all >collect/lsns.json 2>&1 -lspci -vkPP >collect/lspci.txt 2>&1 -lsscsi -vv >collect/lsscsi.txt 2>&1 -lsvmbus -vv >collect/lsvmbus.txt 2>&1 -sysctl -a >collect/sysctl.txt 2>&1 -systemctl status --all -fr >collect/systemctl-status.txt 2>&1 +command -v dpkg >/dev/null && dpkg -l >collect/dpkg.txt 2>&1 +command -v tdnf >/dev/null && tdnf list installed >collect/tdnf.txt 2>&1 +command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 +command -v blkid >/dev/null && blkid >>collect/diskinfo.txt 2>&1 +command -v lscpu >/dev/null && { + lscpu >collect/lscpu.txt 2>&1 + lscpu -J >collect/lscpu.json 2>&1 +} +command -v lshw >/dev/null && { + lshw >collect/lshw.txt 2>&1 + lshw -json >collect/lshw.json 2>&1 +} +command -v lsipc >/dev/null && lsipc >collect/lsipc.txt 2>&1 +command -v lsns >/dev/null && lsns -J --output-all >collect/lsns.json 2>&1 +command -v lspci >/dev/null && lspci -vkPP >collect/lspci.txt 2>&1 +command -v lsscsi >/dev/null && lsscsi -vv >collect/lsscsi.txt 2>&1 +command -v lsvmbus >/dev/null && lsvmbus -vv >collect/lsvmbus.txt 2>&1 +command -v sysctl >/dev/null && sysctl -a >collect/sysctl.txt 2>&1 +command -v systemctl >/dev/null && systemctl status --all -fr >collect/systemctl-status.txt 2>&1 # Collect container runtime information -crictl version >collect/crictl_version.txt 2>&1 -crictl info -o json >collect/crictl_info.json 2>&1 -crictl images -o json >collect/crictl_images.json 2>&1 -crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 -crictl pods -o json >collect/crictl_pods.json 2>&1 -crictl ps -o json >collect/crictl_ps.json 2>&1 -crictl stats -o json >collect/crictl_stats.json 2>&1 -crictl statsp -o json >collect/crictl_statsp.json 2>&1 +command -v crictl >/dev/null && { + crictl version >collect/crictl_version.txt 2>&1 + crictl info -o json >collect/crictl_info.json 2>&1 + crictl images -o json >collect/crictl_images.json 2>&1 + crictl imagefsinfo -o json >collect/crictl_imagefsinfo.json 2>&1 + crictl pods -o json >collect/crictl_pods.json 2>&1 + crictl ps -o json >collect/crictl_ps.json 2>&1 + crictl stats -o json >collect/crictl_stats.json 2>&1 + crictl statsp -o json >collect/crictl_statsp.json 2>&1 +} # Collect network information -conntrack -L >collect/conntrack.txt 2>&1 -conntrack -S >>collect/conntrack.txt 2>&1 -ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 -ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 -ip -4 -d -j route show >collect/ip_4_route.json 2>&1 -ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 -ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 -ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 -ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 -ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 -ip -d -j link show >collect/ip_link.json 2>&1 -ip -d -j netconf show >collect/ip_netconf.json 2>&1 -ip -d -j netns show >collect/ip_netns.json 2>&1 -ip -d -j rule show >collect/ip_rule.json 2>&1 -iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 -ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 -nft -jn list ruleset >collect/nftables.json 2>&1 -ss -anoempiO --cgroup >collect/ss.txt 2>&1 -ss -s >>collect/ss.txt 2>&1 +command -v conntrack >/dev/null && { + conntrack -L >collect/conntrack.txt 2>&1 + conntrack -S >>collect/conntrack.txt 2>&1 +} +command -v ip >/dev/null && { + ip -4 -d -j addr show >collect/ip_4_addr.json 2>&1 + ip -4 -d -j neighbor show >collect/ip_4_neighbor.json 2>&1 + ip -4 -d -j route show >collect/ip_4_route.json 2>&1 + ip -4 -d -j tcpmetrics show >collect/ip_4_tcpmetrics.json 2>&1 + ip -6 -d -j addr show table all >collect/ip_6_addr.json 2>&1 + ip -6 -d -j neighbor show >collect/ip_6_neighbor.json 2>&1 + ip -6 -d -j route show table all >collect/ip_6_route.json 2>&1 + ip -6 -d -j tcpmetrics show >collect/ip_6_tcpmetrics.json 2>&1 + ip -d -j link show >collect/ip_link.json 2>&1 + ip -d -j netconf show >collect/ip_netconf.json 2>&1 + ip -d -j netns show >collect/ip_netns.json 2>&1 + ip -d -j rule show >collect/ip_rule.json 2>&1 +} +command -v iptables >/dev/null && iptables -L -vn --line-numbers >collect/iptables.txt 2>&1 +command -v ip6tables >/dev/null && ip6tables -L -vn --line-numbers >collect/ip6tables.txt 2>&1 +command -v nft >/dev/null && nft -jn list ruleset >collect/nftables.json 2>&1 +command -v ss >/dev/null && { + ss -anoempiO --cgroup >collect/ss.txt 2>&1 + ss -s >>collect/ss.txt 2>&1 +} # Collect network information from network namespaces -ip -all netns exec /bin/bash -x -c " - conntrack -L 2>&1; - conntrack -S 2>&1; - ip -4 -d -j addr show 2>&1; - ip -4 -d -j neighbor show 2>&1; - ip -4 -d -j route show 2>&1; - ip -4 -d -j tcpmetrics show 2>&1; - ip -6 -d -j addr show table all 2>&1; - ip -6 -d -j neighbor show 2>&1; - ip -6 -d -j route show table all 2>&1; - ip -6 -d -j tcpmetrics show 2>&1; - ip -d -j link show 2>&1; - ip -d -j netconf show 2>&1; - ip -d -j netns show 2>&1; - ip -d -j rule show 2>&1; - iptables -L -vn --line-numbers 2>&1; - ip6tables -L -vn --line-numbers 2>&1; - nft -jn list ruleset 2>&1; - ss -anoempiO --cgroup 2>&1; - ss -s 2>&1; +command -v ip >/dev/null && ip -all netns exec /bin/bash -x -c " + command -v conntrack >/dev/null && { + conntrack -L 2>&1; + conntrack -S 2>&1; + } + command -v ip >/dev/null && { + ip -4 -d -j addr show 2>&1; + ip -4 -d -j neighbor show 2>&1; + ip -4 -d -j route show 2>&1; + ip -4 -d -j tcpmetrics show 2>&1; + ip -6 -d -j addr show table all 2>&1; + ip -6 -d -j neighbor show 2>&1; + ip -6 -d -j route show table all 2>&1; + ip -6 -d -j tcpmetrics show 2>&1; + ip -d -j link show 2>&1; + ip -d -j netconf show 2>&1; + ip -d -j netns show 2>&1; + ip -d -j rule show 2>&1; + } + command -v iptables >/dev/null && iptables -L -vn --line-numbers 2>&1; + command -v ip6tables >/dev/null && ip6tables -L -vn --line-numbers 2>&1; + command -v nft >/dev/null && nft -jn list ruleset 2>&1; + command -v ss >/dev/null && { + ss -anoempiO --cgroup 2>&1; + ss -s 2>&1; + } " >collect/ip_netns_commands.txt 2>&1 # Collect general information From 135c5d735315bc28e2a9c0f04b86a67c0dd2c85d Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Wed, 24 Jan 2024 20:15:45 +0000 Subject: [PATCH 6/8] feat: update aks-log-collector.sh to use include a few more logs --- .../cloud-init/artifacts/aks-log-collector.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.sh b/parts/linux/cloud-init/artifacts/aks-log-collector.sh index 5a2d22d81ff..670253525b4 100644 --- a/parts/linux/cloud-init/artifacts/aks-log-collector.sh +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.sh @@ -61,11 +61,17 @@ mkdir collect collect/proc collect/proc/net # Include some disk listings command -v find >/dev/null && find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 -# Collect system information +# Collect all installed packages for Ubuntu and Azure Linux command -v dpkg >/dev/null && dpkg -l >collect/dpkg.txt 2>&1 command -v tdnf >/dev/null && tdnf list installed >collect/tdnf.txt 2>&1 -command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 + +# Collect system information command -v blkid >/dev/null && blkid >>collect/diskinfo.txt 2>&1 +command -v df >/dev/null && { + df -al > collect/du_bytes.txt 2>&1 + df -ail >> collect/du_inodes.txt 2>&1 +} +command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 command -v lscpu >/dev/null && { lscpu >collect/lscpu.txt 2>&1 lscpu -J >collect/lscpu.json 2>&1 @@ -167,6 +173,13 @@ GLOBS+=(/etc/containerd/*) GLOBS+=(/etc/default/kubelet) GLOBS+=(/etc/kubernetes/manifests/*) GLOBS+=(/var/lib/kubelet/kubeconfig) +GLOBS+=(/var/log/azure-cni*) +GLOBS+=(/var/log/azure-cns*) +GLOBS+=(/var/log/azure-ipam*) +GLOBS+=(/var/log/azure-vnet*) +GLOBS+=(/var/log/cillium-cni*) +GLOBS+=(/var/run/azure-vnet*) +GLOBS+=(/var/run/azure-cns*) # based on MANIFEST_FULL from Azure Linux Agent's log collector # https://github.com/Azure/WALinuxAgent/blob/master/azurelinuxagent/common/logcollector_manifests.py @@ -230,7 +243,7 @@ GLOBS+=(/var/log/secure*) echo "Adding log files to zip archive..." for file in ${GLOBS[*]}; do if test -e $file; then - zip -DZ deflate -u aks_logs.zip $file + zip -DZ deflate -u aks_logs.zip $file -x '*.sock' # The API for the log bundle has a max file size (defined above, usually 100MB), so if # adding this last file made the zip go over that size, remove that file and stop processing. From 99bf50ff7dc9a3c774571e20e6ee465ac4e8901d Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Wed, 24 Jan 2024 20:24:54 +0000 Subject: [PATCH 7/8] feat: forgot to generate --- pkg/templates/templates_generated.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 09e2a458f61..d8ba36ad920 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -415,11 +415,17 @@ mkdir collect collect/proc collect/proc/net # Include some disk listings command -v find >/dev/null && find /dev /etc /var/lib/waagent /var/log -ls >collect/file_listings.txt 2>&1 -# Collect system information +# Collect all installed packages for Ubuntu and Azure Linux command -v dpkg >/dev/null && dpkg -l >collect/dpkg.txt 2>&1 command -v tdnf >/dev/null && tdnf list installed >collect/tdnf.txt 2>&1 -command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 + +# Collect system information command -v blkid >/dev/null && blkid >>collect/diskinfo.txt 2>&1 +command -v df >/dev/null && { + df -al > collect/du_bytes.txt 2>&1 + df -ail >> collect/du_inodes.txt 2>&1 +} +command -v lsblk >/dev/null && lsblk >collect/diskinfo.txt 2>&1 command -v lscpu >/dev/null && { lscpu >collect/lscpu.txt 2>&1 lscpu -J >collect/lscpu.json 2>&1 @@ -521,6 +527,13 @@ GLOBS+=(/etc/containerd/*) GLOBS+=(/etc/default/kubelet) GLOBS+=(/etc/kubernetes/manifests/*) GLOBS+=(/var/lib/kubelet/kubeconfig) +GLOBS+=(/var/log/azure-cni*) +GLOBS+=(/var/log/azure-cns*) +GLOBS+=(/var/log/azure-ipam*) +GLOBS+=(/var/log/azure-vnet*) +GLOBS+=(/var/log/cillium-cni*) +GLOBS+=(/var/run/azure-vnet*) +GLOBS+=(/var/run/azure-cns*) # based on MANIFEST_FULL from Azure Linux Agent's log collector # https://github.com/Azure/WALinuxAgent/blob/master/azurelinuxagent/common/logcollector_manifests.py @@ -584,7 +597,7 @@ GLOBS+=(/var/log/secure*) echo "Adding log files to zip archive..." for file in ${GLOBS[*]}; do if test -e $file; then - zip -DZ deflate -u aks_logs.zip $file + zip -DZ deflate -u aks_logs.zip $file -x '*.sock' # The API for the log bundle has a max file size (defined above, usually 100MB), so if # adding this last file made the zip go over that size, remove that file and stop processing. From 5ba1865df9843c25d7ef6ddd0da4effc9963c182 Mon Sep 17 00:00:00 2001 From: "Patrick W. Healy" Date: Thu, 25 Jan 2024 18:01:16 +0000 Subject: [PATCH 8/8] feat: update aks log collector memorymax so tdnf completes --- parts/linux/cloud-init/artifacts/aks-log-collector.slice | 2 +- pkg/templates/templates_generated.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/aks-log-collector.slice b/parts/linux/cloud-init/artifacts/aks-log-collector.slice index 42ddd912e27..f35d1a68520 100644 --- a/parts/linux/cloud-init/artifacts/aks-log-collector.slice +++ b/parts/linux/cloud-init/artifacts/aks-log-collector.slice @@ -10,4 +10,4 @@ CPUAccounting=true #CPUQuota=10% CPUShares=100 CPUWeight=1 -MemoryMax=128M +MemoryMax=256M diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index d8ba36ad920..7dc52a6923b 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -646,7 +646,7 @@ CPUAccounting=true #CPUQuota=10% CPUShares=100 CPUWeight=1 -MemoryMax=128M +MemoryMax=256M `) func linuxCloudInitArtifactsAksLogCollectorSliceBytes() ([]byte, error) {