diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index 7c9d7a9d60..0b470af6de 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -56,7 +56,7 @@ jobs: name: Linux Test needs: lint # Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2). - runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }} + runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "ubuntu1604"]'), matrix.distro)] }} strategy: fail-fast: false matrix: @@ -71,7 +71,6 @@ jobs: - centos9 - debian11 - debian12 - - opensuse12 - ubuntu2004 - ubuntu2204 diff --git a/.github/workflows/auto-instrumentation.yml b/.github/workflows/auto-instrumentation.yml index d525d75c22..603cdfb3fc 100644 --- a/.github/workflows/auto-instrumentation.yml +++ b/.github/workflows/auto-instrumentation.yml @@ -96,8 +96,7 @@ jobs: testcase="\"express\",\"tomcat\",\"dotnet\"" # splunk-otel-dotnet currently not supported on arm64 # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner - # opensuse-12 (leap 42) does not support arm64 - exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}' + exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}' matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"TESTCASE\": [${testcase}], \"exclude\": [${exclude}]}" echo "$matrix" | jq echo "matrix=${matrix}" >> $GITHUB_OUTPUT @@ -105,10 +104,10 @@ jobs: matrix: ${{ steps.get-matrix.outputs.matrix }} test-package: - # Amazon Linux 2 and OpenSUSE 12 use cgroup v1 + # Amazon Linux 2 uses cgroup v1 # Ubuntu 24.04 uses cgroup v2 - # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above - runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} + # Fallback to Ubuntu 20.04 when appropriate + runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} timeout-minutes: 60 needs: [cross-compile, build-package, test-package-matrix] strategy: diff --git a/.github/workflows/installer-script-test.yml b/.github/workflows/installer-script-test.yml index 0580ae338a..d35a0d46eb 100644 --- a/.github/workflows/installer-script-test.yml +++ b/.github/workflows/installer-script-test.yml @@ -38,9 +38,8 @@ jobs: distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done) arch='"amd64","arm64"' instrumentation='"none","preload","systemd"' - # opensuse-12 (leap 42) does not support arm64 # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner - exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}' + exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}' matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}], \"exclude\": [${exclude}]}" echo "$matrix" | jq echo "matrix=${matrix}" >> $GITHUB_OUTPUT @@ -48,10 +47,10 @@ jobs: matrix: ${{ steps.get-matrix.outputs.matrix }} linux-installer-script-test: - # Amazon Linux 2 and OpenSUSE 12 use cgroup v1 + # Amazon Linux 2 uses cgroup v1 # Ubuntu 24.04 uses cgroup v2 - # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above - runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} + # Fallback to Ubuntu 20.04 when appropriate + runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} timeout-minutes: 90 needs: installer-test-matrix strategy: diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml index 715eee69c4..70ad8f3e43 100644 --- a/.github/workflows/linux-package-test.yml +++ b/.github/workflows/linux-package-test.yml @@ -151,9 +151,8 @@ jobs: fi distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done) arch="\"amd64\", \"arm64\"" - # opensuse-12 (leap 42) does not support arm64 - # amazonlinux-2 and tar-centos-7 require cgroup v1, only available on version 20.04 that doesn't have an arm runner - exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"},{"DISTRO": "tar-centos-7", "ARCH": "arm64"}' + # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner + exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}' matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"exclude\": [${exclude}]}" echo "$matrix" | jq echo "matrix=${matrix}" >> $GITHUB_OUTPUT @@ -161,10 +160,10 @@ jobs: matrix: ${{ steps.get-matrix.outputs.matrix }} test-package: - # Amazon Linux 2, OpenSUSE 12, and centos7 use cgroup v1 + # Amazon Linux 2 uses cgroup v1 # Ubuntu 24.04 uses cgroup v2 - # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above - runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12' && matrix.DISTRO != 'tar-centos-7') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} + # Fallback to Ubuntu 20.04 when appropriate + runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }} timeout-minutes: 30 needs: [build-package, test-package-matrix] strategy: diff --git a/.github/workflows/puppet-test.yml b/.github/workflows/puppet-test.yml index dd116e35fc..fa6ef16384 100644 --- a/.github/workflows/puppet-test.yml +++ b/.github/workflows/puppet-test.yml @@ -80,10 +80,10 @@ jobs: puppet-test: name: puppet-test - # Amazon Linux 2 and OpenSUSE 12 use cgroup v1 + # Amazon Linux 2 uses cgroup v1 # Ubuntu 24.04 uses cgroup v2 - # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above - runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }} + # Fallback to Ubuntu 20.04 when appropriate + runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }} timeout-minutes: 60 needs: - puppet-lint diff --git a/CHANGELOG.md b/CHANGELOG.md index bf37783c70..e1e8bab780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 🛑 Breaking changes 🛑 + +- (Splunk) Support for OpenSUSE 12 and CentOS 7 (tar package) has been dropped ([#6073](https://github.com/signalfx/splunk-otel-collector/pull/6073)) + ## v0.122.0 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.122.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.122.1) diff --git a/deployments/ansible/README.md b/deployments/ansible/README.md index 3f39a85b11..e8f6c48764 100644 --- a/deployments/ansible/README.md +++ b/deployments/ansible/README.md @@ -13,10 +13,10 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html). Currently, the following Linux distributions and versions are supported: - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.) -- CentOS / Red Hat: 7, 8, 9 +- CentOS / Red Hat: 8, 9 - Oracle: 8, 9 - Debian: 9, 10, 11 -- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) +- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) - Ubuntu: 16.04, 18.04, 20.04, 22.04 ## Windows diff --git a/deployments/chef/README.md b/deployments/chef/README.md index 0813812f12..f931ca6d4d 100644 --- a/deployments/chef/README.md +++ b/deployments/chef/README.md @@ -17,10 +17,10 @@ https://www.splunk.com/en_us/observability.html). Currently, the following Linux distributions and versions are supported: - Amazon Linux: 2 -- CentOS / Red Hat: 7, 8, 9 +- CentOS / Red Hat: 8, 9 - Oracle: 8, 9 - Debian: 9, 10, 11 -- SUSE: 12, 15 (**Note:** Only for Collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) +- SUSE: 15 (**Note:** Only for Collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) - Ubuntu: 18.04, 20.04, 22.04 ## Windows diff --git a/deployments/puppet/README.md b/deployments/puppet/README.md index 6d97c5fe83..83f3aebd28 100644 --- a/deployments/puppet/README.md +++ b/deployments/puppet/README.md @@ -8,10 +8,10 @@ OpenTelemetry Collector. Currently, the following Linux distributions and versions are supported: - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.) -- CentOS / Red Hat: 7, 8, 9 +- CentOS / Red Hat: 8, 9 - Oracle: 8, 9 - Debian: 9, 10, 11 -- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) +- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.) - Ubuntu: 16.04, 18.04, 20.04, 22.04 > Note: `systemd` is required to be installed on the host for service diff --git a/deployments/salt/README.md b/deployments/salt/README.md index efb776d056..ad9b7ba0a5 100644 --- a/deployments/salt/README.md +++ b/deployments/salt/README.md @@ -8,10 +8,10 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html). Currently, the following Linux distributions and versions are supported: - Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.) -- CentOS / Red Hat: 7, 8, 9 +- CentOS / Red Hat: 8, 9 - Oracle: 8, 9 - Debian: 9, 10, 11 -- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with fluentd not currently supported.) +- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with fluentd not currently supported.) - Ubuntu: 16.04, 18.04, 20.04, 22.04 ## Prerequisites diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 deleted file mode 100644 index 819c3b240e..0000000000 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 +++ /dev/null @@ -1,40 +0,0 @@ -# A opensuse12 image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM opensuse/leap:42 - -ENV container docker - -RUN sed -i 's|download.opensuse.org|ftp5.gwdg.de/pub/opensuse/discontinued|' /etc/zypp/repos.d/*.repo -RUN zypper -n clean && zypper -n refresh -RUN zypper -n install -l curl procps dbus-1 systemd-sysvinit tar wget - -RUN rpm --import https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406 - -ARG PUPPET_RELEASE="6" -RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-sles-12.noarch.rpm && \ - zypper --gpg-auto-import-keys -n refresh && \ - zypper install -y puppet-agent - -RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \ - mkdir -p /opt/ && \ - tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \ - mv /opt/node* /opt/node - -RUN (cd /usr/lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\ - rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /usr/lib/systemd/system/basic.target.wants/*;\ - rm -f /usr/lib/systemd/system/anaconda.target.wants/*; - -VOLUME [ "/sys/fs/cgroup" ] - -ENV PATH=/opt/puppetlabs/bin:/opt/node/bin:$PATH - -RUN puppet module install puppetlabs-stdlib --version 4.24.0 - -COPY deployments/puppet /etc/puppetlabs/code/environments/production/modules/splunk_otel_collector - -CMD ["/sbin/init"] diff --git a/packaging/tests/images/rpm/Dockerfile.opensuse-12 b/packaging/tests/images/rpm/Dockerfile.opensuse-12 deleted file mode 100644 index fcbe9814a0..0000000000 --- a/packaging/tests/images/rpm/Dockerfile.opensuse-12 +++ /dev/null @@ -1,22 +0,0 @@ -# A opensuse12 image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM opensuse/leap:42 - -ENV container docker - -RUN sed -i 's|download.opensuse.org|ftp5.gwdg.de/pub/opensuse/discontinued|' /etc/zypp/repos.d/*.repo -RUN zypper -n clean && zypper -n refresh -RUN zypper -n install -l curl procps dbus-1 systemd-sysvinit tar wget - -RUN (cd /usr/lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\ - rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /usr/lib/systemd/system/basic.target.wants/*;\ - rm -f /usr/lib/systemd/system/anaconda.target.wants/*; - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"] diff --git a/packaging/tests/images/tar/Dockerfile.tar-centos-7 b/packaging/tests/images/tar/Dockerfile.tar-centos-7 deleted file mode 100644 index 4d806499c2..0000000000 --- a/packaging/tests/images/tar/Dockerfile.tar-centos-7 +++ /dev/null @@ -1,22 +0,0 @@ -# A centos7 image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM centos:7 - -ENV container docker - -RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -RUN yum install -y curl procps initscripts systemd wget - -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/basic.target.wants/*;\ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/usr/sbin/init"] diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 deleted file mode 100644 index 8aa81dfe0b..0000000000 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 +++ /dev/null @@ -1,41 +0,0 @@ -# A opensuse12 image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM tomcat:9-jre8 as tomcat - -FROM opensuse/leap:42 - -ARG TARGETARCH - -ENV container docker - -RUN sed -i 's|download.opensuse.org|ftp5.gwdg.de/pub/opensuse/discontinued|' /etc/zypp/repos.d/*.repo -RUN zypper -n clean && zypper -n refresh -RUN zypper -n install -l curl dbus-1 gzip procps python3 systemd-sysvinit tar wget - -RUN (cd /usr/lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\ - rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /usr/lib/systemd/system/basic.target.wants/*;\ - rm -f /usr/lib/systemd/system/anaconda.target.wants/*; - -COPY --from=tomcat /usr/local/tomcat /usr/local/tomcat -COPY --from=tomcat /opt/java /opt/java -COPY instrumentation/setup-tomcat.sh /opt/ -RUN bash /opt/setup-tomcat.sh - -ARG NODE_VERSION=v16 -COPY instrumentation/setup-express.sh /opt -RUN bash /opt/setup-express.sh - -COPY instrumentation/setup-dotnet.sh /opt -RUN if [ "$TARGETARCH" = "amd64" ]; then \ - zypper -n install libicu && \ - bash /opt/setup-dotnet.sh; \ - fi - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"]