diff --git a/cmake/windows-setup.cmake b/cmake/windows-setup.cmake index dbd7f4a4a2d..7f86c0c1d3b 100644 --- a/cmake/windows-setup.cmake +++ b/cmake/windows-setup.cmake @@ -63,6 +63,7 @@ if(FLB_WINDOWS_DEFAULTS) # disable calyptia fleet management for now set(FLB_IN_CALYPTIA_FLEET No) set(FLB_IN_SPLUNK Yes) + set(FLB_IN_SNMP No) # OUTPUT plugins # ============== diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 9f75666e55a..c4edac12acc 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -226,7 +226,7 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/ openssl \ htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \ cmake make tar flex bison \ - libssl-dev libsasl2-dev libsystemd-dev/bullseye-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \ + libssl-dev libsasl2-dev libsystemd-dev/bullseye-backports zlib1g-dev libpq-dev libyaml-dev libsnmp-dev postgresql-server-dev-all \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index daeb49a9771..4c745b98582 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -8,7 +8,7 @@ RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \ wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 diff --git a/packaging/distros/amazonlinux/Dockerfile b/packaging/distros/amazonlinux/Dockerfile index fa9b17c5bd7..3a8101ebe63 100644 --- a/packaging/distros/amazonlinux/Dockerfile +++ b/packaging/distros/amazonlinux/Dockerfile @@ -18,7 +18,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel && \ + cmake3 libyaml-devel libsnmp-devel zlib-devel && \ yum clean all # amazonlinux/2.arm64v8 base image @@ -32,7 +32,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel && \ + cmake3 libyaml-devel libsnmp-devel zlib-devel && \ yum clean all FROM amazonlinux:2023 as amazonlinux-2023-base @@ -43,7 +43,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel && \ + cmake3 libyaml-devel libsnmp-devel zlib-devel && \ yum clean all # hadolint ignore=DL3029 @@ -57,7 +57,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel && \ + cmake3 libyaml-devel libsnmp-devel zlib-devel && \ yum clean all # Common build for all distributions now diff --git a/packaging/distros/centos/Dockerfile b/packaging/distros/centos/Dockerfile index 0954659f437..d414276cd98 100644 --- a/packaging/distros/centos/Dockerfile +++ b/packaging/distros/centos/Dockerfile @@ -17,7 +17,7 @@ RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \ wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 && \ @@ -36,7 +36,7 @@ RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ - postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ + postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \ wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ rpm -ivh epel-release-latest-7.noarch.rpm && \ yum install -y cmake3 && \ @@ -66,7 +66,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - libyaml-devel zlib-devel && \ + libyaml-devel libsnmp-devel zlib-devel && \ yum clean all ARG FLB_OUT_PGSQL=On @@ -90,7 +90,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - libyaml-devel zlib-devel && \ + libyaml-devel libsnmp-devel zlib-devel && \ yum clean all ARG FLB_OUT_PGSQL=On @@ -109,7 +109,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set- wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - libyaml-devel zlib-devel && \ + libyaml-devel libsnmp-devel zlib-devel && \ dnf clean all ARG FLB_OUT_PGSQL=On @@ -127,7 +127,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set- wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ - libyaml-devel zlib-devel && \ + libyaml-devel libsnmp-devel zlib-devel && \ dnf clean all ARG FLB_OUT_PGSQL=On diff --git a/packaging/distros/debian/Dockerfile b/packaging/distros/debian/Dockerfile index d37871501cc..660f765a073 100644 --- a/packaging/distros/debian/Dockerfile +++ b/packaging/distros/debian/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/buster.arm64v8 base image @@ -34,7 +34,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye base image @@ -47,7 +47,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye.arm64v8 base image @@ -62,7 +62,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bookworm base image @@ -75,7 +75,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl3 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bookworm.arm64v8 base image @@ -90,7 +90,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl3 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now diff --git a/packaging/distros/raspbian/Dockerfile b/packaging/distros/raspbian/Dockerfile index 03ca9708772..1d244e56f6c 100644 --- a/packaging/distros/raspbian/Dockerfile +++ b/packaging/distros/raspbian/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && \ make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # raspbian/bullseye base image @@ -31,7 +31,7 @@ RUN apt-get update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile index 40272f8fcd7..f8664f18fad 100644 --- a/packaging/distros/ubuntu/Dockerfile +++ b/packaging/distros/ubuntu/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev cmake \ make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all software-properties-common \ - software-properties-common libyaml-dev apt-transport-https \ + software-properties-common libyaml-dev libsnmp-dev apt-transport-https \ pkg-config libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.0 zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ @@ -39,7 +39,7 @@ RUN apt-get update && \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ - software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \ + software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ @@ -61,7 +61,7 @@ RUN apt-get update && \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ - software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \ + software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ @@ -79,7 +79,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/20.04.arm64v8 base image @@ -93,7 +93,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04 base image @@ -105,7 +105,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04.arm64v8 base image @@ -119,7 +119,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now