From 78039317d233f0bd5756701fa18a1da250d01059 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:05:32 +0100 Subject: [PATCH 01/18] .github/workflows/: Rename container images. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bookworm_amd64 → debian12 * bullseye_amd64 → debian11 * buster_amd64 → debian10 * mantic_amd64 → ubuntu23.10 * jammy_amd64 → ubuntu22.04 * focal_amd64 → ubuntu20.04 * el9_x86_64 → centos9 * fedora38_x86_64 -> fedora38 * fedora_rawhide_x86_64 → fedora_main --- .github/workflows/build.yml | 26 +++++++++++++------------- .github/workflows/distcheck.yml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a3841c138..eda931c836 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,22 +23,22 @@ jobs: matrix: container_tag: # debian family - - bookworm_amd64 - - bullseye_amd64 - - buster_amd64 + - debian12 + - debian11 + - debian10 # Ubuntu - - mantic_amd64 - - jammy_amd64 - - focal_amd64 + - ubuntu23.10 + - ubuntu22.04 + - ubuntu20.04 # RedHat family - - el9_x86_64 + - centos9 - fedora39 - - fedora38_x86_64 + - fedora38 configure_flags: [''] include: - - container_tag: bookworm_amd64 + - container_tag: debian12 configure_flags: '--enable-debug' - - container_tag: bookworm_amd64 + - container_tag: debian12 # By default clang emits DWARF v5, which Valgrind cannot read yet. # https://github.com/llvm/llvm-project/issues/56550 configure_flags: 'CC=clang CXX=clang++ CFLAGS=-gdwarf-4' @@ -77,7 +77,7 @@ jobs: run: exit $(< make-check.status) experimental: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: collectd/ci:${{ matrix.container_tag }} continue-on-error: true strategy: @@ -86,12 +86,12 @@ jobs: # for tasks that are optional, use the continue-on-error option, to prevent a workflow from failing when the task fails container_tag: - debian_unstable - - fedora_rawhide_x86_64 + - fedora_main # Add additional per-distro vars here. include: - container_tag: debian_unstable configure_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt" - - container_tag: fedora_rawhide_x86_64 + - container_tag: fedora_main cflags: "-fPIE -Wno-deprecated-declarations" cppflags: "-fPIE -Wno-deprecated-declarations" configure_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt --disable-xmms" diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml index 545b664fc5..992ffe5f1a 100644 --- a/.github/workflows/distcheck.yml +++ b/.github/workflows/distcheck.yml @@ -16,7 +16,7 @@ defaults: jobs: make_distcheck: runs-on: ubuntu-latest - container: collectd/ci:bullseye_amd64 + container: collectd/ci:debian11 env: # this env var picked up by valgrind during make check phase VALGRIND_OPTS: "--errors-for-leak-kinds=definite" From b0d12dc575e190fa3c8f12dabddff4958c16d74b Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:06:02 +0100 Subject: [PATCH 02/18] .github/workflows/distcheck.yml: Run on Debian12 (current stable). --- .github/workflows/distcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml index 992ffe5f1a..d63cc56818 100644 --- a/.github/workflows/distcheck.yml +++ b/.github/workflows/distcheck.yml @@ -16,7 +16,7 @@ defaults: jobs: make_distcheck: runs-on: ubuntu-latest - container: collectd/ci:debian11 + container: collectd/ci:debian12 env: # this env var picked up by valgrind during make check phase VALGRIND_OPTS: "--errors-for-leak-kinds=definite" From 9f77720b001a44468fdfc366f1cd8c83ade9fb6b Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:42:21 +0100 Subject: [PATCH 03/18] .cirrus.yml: Rename container images. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bookworm_amd64 → debian12 * mantic_amd64 → ubuntu23.10 * el9_x86_64 → centos9 * fedora_rawhide_x86_64 → fedora_main --- .cirrus.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ab37691096..70969750d2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,7 @@ env: # release_ready_task: container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 lint_script: - /checks/check-bashisms.sh - /checks/check-pod.sh @@ -27,10 +27,10 @@ release_ready_task: debian_default_toolchain_task: matrix: - container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 allow_failures: false - container: - image: collectd/ci:mantic_amd64 + image: collectd/ci:ubuntu23.10 allow_failures: false - container: image: collectd/ci:debian_unstable @@ -59,16 +59,20 @@ debian_default_toolchain_task: redhat_default_toolchain_task: matrix: - container: - image: collectd/ci:el9_x86_64 + image: collectd/ci:centos9 allow_failures: false + env: + CONTAINER_IMAGE: centos9 - container: image: collectd/ci:fedora39 allow_failures: false - container: - image: collectd/ci:fedora_rawhide_x86_64 + image: collectd/ci:fedora_main allow_failures: true skip_notifications: true only_if: $CIRRUS_BRANCH == 'main' + env: + CONTAINER_IMAGE: fedora_main configure_script: - ./build.sh - gcc --version @@ -86,7 +90,7 @@ redhat_default_toolchain_task: # Some are expected to fail, others should always pass non_standard_toolchains_task: container: - image: collectd/ci:bookworm_amd64 + image: collectd/ci:debian12 only_if: $CIRRUS_PR == '' matrix: From 3594464cc46ba65f840e05672a78a33d47acecfc Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 13:34:41 +0100 Subject: [PATCH 04/18] .cirrus.yml: Provide expected plugin list to `check-built-plugins.sh` if present. --- .cirrus.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 70969750d2..176e8158b4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,14 +29,20 @@ debian_default_toolchain_task: - container: image: collectd/ci:debian12 allow_failures: false + env: + CONTAINER_IMAGE: debian12 - container: image: collectd/ci:ubuntu23.10 allow_failures: false + env: + CONTAINER_IMAGE: ubuntu23.10 - container: image: collectd/ci:debian_unstable allow_failures: true skip_notifications: true only_if: $CIRRUS_BRANCH == 'main' + env: + CONTAINER_IMAGE: debian_unstable configure_script: - ./build.sh - gcc --version @@ -49,7 +55,12 @@ debian_default_toolchain_task: - make -j$(nproc) -sk tests_script: - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) - - /checks/check-built-plugins.sh + - | + if [[ -e ".expected-plugins/$CONTAINER_IMAGE" ]]; then + /checks/check-built-plugins.sh ".expected-plugins/$CONTAINER_IMAGE" + else + /checks/check-built-plugins.sh + fi ### # Default toolchain and build flags used in RPM packages, on a range of RedHat @@ -66,6 +77,8 @@ redhat_default_toolchain_task: - container: image: collectd/ci:fedora39 allow_failures: false + env: + CONTAINER_IMAGE: fedora39 - container: image: collectd/ci:fedora_main allow_failures: true @@ -81,7 +94,12 @@ redhat_default_toolchain_task: - make -j$(nproc) -sk tests_script: - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) - - /checks/check-built-plugins.sh + - | + if [[ -e ".expected-plugins/$CONTAINER_IMAGE" ]]; then + /checks/check-built-plugins.sh ".expected-plugins/$CONTAINER_IMAGE" + else + /checks/check-built-plugins.sh + fi ### From d634b86501a081040ef08e4c49d0ce5fd8889a6f Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:40:01 +0100 Subject: [PATCH 05/18] .expected-plugins: Add empty files for all distros. --- .expected-plugins/centos9 | 0 .expected-plugins/debian10 | 0 .expected-plugins/debian11 | 0 .expected-plugins/debian12 | 0 .expected-plugins/debian_unstable | 0 .expected-plugins/fedora38 | 0 .expected-plugins/fedora39 | 0 .expected-plugins/fedora_main | 0 .expected-plugins/ubuntu20.04 | 0 .expected-plugins/ubuntu22.04 | 0 .expected-plugins/ubuntu23.10 | 0 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .expected-plugins/centos9 create mode 100644 .expected-plugins/debian10 create mode 100644 .expected-plugins/debian11 create mode 100644 .expected-plugins/debian12 create mode 100644 .expected-plugins/debian_unstable create mode 100644 .expected-plugins/fedora38 create mode 100644 .expected-plugins/fedora39 create mode 100644 .expected-plugins/fedora_main create mode 100644 .expected-plugins/ubuntu20.04 create mode 100644 .expected-plugins/ubuntu22.04 create mode 100644 .expected-plugins/ubuntu23.10 diff --git a/.expected-plugins/centos9 b/.expected-plugins/centos9 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/debian10 b/.expected-plugins/debian10 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/debian11 b/.expected-plugins/debian11 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/debian12 b/.expected-plugins/debian12 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/debian_unstable b/.expected-plugins/debian_unstable new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/fedora38 b/.expected-plugins/fedora38 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/fedora39 b/.expected-plugins/fedora39 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/fedora_main b/.expected-plugins/fedora_main new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/ubuntu20.04 b/.expected-plugins/ubuntu20.04 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/ubuntu22.04 b/.expected-plugins/ubuntu22.04 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.expected-plugins/ubuntu23.10 b/.expected-plugins/ubuntu23.10 new file mode 100644 index 0000000000..e69de29bb2 From 9338dc32d18e496d64e3ae461c8120780fbf9ac0 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:34:13 +0100 Subject: [PATCH 06/18] .expected-plugins/debian12: Import expected plugins list. --- .expected-plugins/debian12 | 158 +++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/.expected-plugins/debian12 b/.expected-plugins/debian12 index e69de29bb2..86d72a3279 100644 --- a/.expected-plugins/debian12 +++ b/.expected-plugins/debian12 @@ -0,0 +1,158 @@ +# Debian 12 ("Bookworm") +libcollectdclient +#aggregation +#amqp +#amqp1 +apache +apcups +#barometer +battery +bind +buddyinfo +capabilities +ceph +cgroups +#check_uptime +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +#csv +curl +curl_json +#curl_xml +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +#gmond +gps +#grpc +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +#java +load +logfile +log_logstash +logparser +#lua +madwifi +#match_empty_counter +#match_hashed +#match_regex +#match_timediff +#match_value +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +#modbus +#mqtt +multimeter +mysql +netlink +#network +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +#openldap +openvpn +ovs_events +ovs_stats +pcie_errors +#perl +pinba +ping +#postgresql +powerdns +processes +procevent +protocols +#python +#ras +#redis +#rrdcached +#rrdtool +sensors +serial +smart +#snmp +#snmp_agent +#statsd +swap +synproxy +sysevent +syslog +table +tail +tail_csv +#target_notification +#target_replace +#target_scale +#target_set +#target_v5upgrade +tcpconns +teamspeak2 +ted +thermal +#threshold +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +#write_graphite +write_http +write_influxdb_udp +#write_kafka +write_log +#write_mongodb +write_prometheus +#write_redis +#write_riemann +#write_sensu +write_stackdriver +#write_syslog +#write_tsdb +xencpu +zfs_arc +zookeeper From 47bd0922bb0f9a03c3e1f26ae104e49009e3fd68 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 13:48:55 +0100 Subject: [PATCH 07/18] .expected-plugins/ubuntu23.10: Import expected plugins list. --- .expected-plugins/ubuntu23.10 | 157 ++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/.expected-plugins/ubuntu23.10 b/.expected-plugins/ubuntu23.10 index e69de29bb2..67f628d04b 100644 --- a/.expected-plugins/ubuntu23.10 +++ b/.expected-plugins/ubuntu23.10 @@ -0,0 +1,157 @@ +# Ubuntu 23.10 ("Mantic Minotaur") + +libcollectdclient +#aggregation +#amqp +#amqp1 +apache +apcups +#barometer +battery +bind +buddyinfo +capabilities +ceph +cgroups +#check_uptime +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +#csv +curl +curl_json +#curl_xml +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +#gmond +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +#java +load +logfile +log_logstash +logparser +#lua +madwifi +#match_empty_counter +#match_hashed +#match_regex +#match_timediff +#match_value +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +#modbus +#mqtt +multimeter +mysql +netlink +#network +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +#openldap +openvpn +ovs_events +ovs_stats +pcie_errors +#perl +pinba +ping +#postgresql +powerdns +processes +procevent +protocols +#python +#redis +#rrdcached +#rrdtool +sensors +serial +smart +#snmp +#snmp_agent +#statsd +swap +synproxy +sysevent +syslog +table +tail +tail_csv +#target_notification +#target_replace +#target_scale +#target_set +#target_v5upgrade +tcpconns +teamspeak2 +ted +thermal +#threshold +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +#write_graphite +write_http +write_influxdb_udp +#write_kafka +write_log +#write_mongodb +write_prometheus +#write_redis +#write_riemann +#write_sensu +write_stackdriver +#write_syslog +#write_tsdb +xencpu +zfs_arc +zookeeper From 4611e1a2c35222e006f4b5903b6e17c91456825d Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:49:26 +0100 Subject: [PATCH 08/18] .expected-plugins/fedora39: Import expected plugin list. --- .expected-plugins/fedora39 | 111 +++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/.expected-plugins/fedora39 b/.expected-plugins/fedora39 index e69de29bb2..9736340f07 100644 --- a/.expected-plugins/fedora39 +++ b/.expected-plugins/fedora39 @@ -0,0 +1,111 @@ +# Fedora 39 +libcollectdclient +apache +apcups +battery +bind +buddyinfo +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +zfs_arc +zookeeper From 521e6f30c42179edb19490cac31ee6bb3fee338f Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 14:52:25 +0100 Subject: [PATCH 09/18] .expected-plugins/centos9: Import expected plugins list. --- .expected-plugins/centos9 | 113 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/.expected-plugins/centos9 b/.expected-plugins/centos9 index e69de29bb2..0d00139eef 100644 --- a/.expected-plugins/centos9 +++ b/.expected-plugins/centos9 @@ -0,0 +1,113 @@ +# CentOS 9 +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdk_telemetry +dpdkevents +dpdkstat +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_pmu +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +log_logstash +logfile +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +zfs_arc +zookeeper From 300f6aed6e73980a97d335527c180bf368309f4b Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 16:54:19 +0100 Subject: [PATCH 10/18] .github/workflows/build.yml: Add a "Check expected plugins" step. --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eda931c836..0a9e915ce2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,11 @@ jobs: path: "*.log" - name: Report check status run: exit $(< make-check.status) + - name: Check expected plugins + run: | + if [[ -e ".expected-plugins/${{ matrix.container_tag }}" ]]; then + /checks/check-built-plugins.sh ".expected-plugins/${{ matrix.container_tag }}" + fi experimental: runs-on: ubuntu-latest From 03239d01afb473be3ad527935046eb3188a12669 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:15:15 +0100 Subject: [PATCH 11/18] .expected-plugins/debian11: Import expected plugins list. --- .expected-plugins/debian11 | 114 +++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/.expected-plugins/debian11 b/.expected-plugins/debian11 index e69de29bb2..ff49eb4d09 100644 --- a/.expected-plugins/debian11 +++ b/.expected-plugins/debian11 @@ -0,0 +1,114 @@ +# Debian 11 ("Bullseye") +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +xencpu +zfs_arc +zookeeper From e8322d28d9b33beefe7f8bd1c9a2023eff0c4729 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:16:42 +0100 Subject: [PATCH 12/18] .expected-plugins/debian10: Import expected plugins list. --- .expected-plugins/debian10 | 115 +++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/.expected-plugins/debian10 b/.expected-plugins/debian10 index e69de29bb2..5b09b0c03b 100644 --- a/.expected-plugins/debian10 +++ b/.expected-plugins/debian10 @@ -0,0 +1,115 @@ +# Debian 10 ("Buster") +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +tokyotyrant +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +xencpu +zfs_arc +zookeeper From 19df55a9b44506d1844ca26042c31b105f6477d8 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:19:09 +0100 Subject: [PATCH 13/18] .expected-plugins/ubuntu22.04: Import expected plugins list. --- .expected-plugins/ubuntu22.04 | 114 ++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/.expected-plugins/ubuntu22.04 b/.expected-plugins/ubuntu22.04 index e69de29bb2..d4e23aedc0 100644 --- a/.expected-plugins/ubuntu22.04 +++ b/.expected-plugins/ubuntu22.04 @@ -0,0 +1,114 @@ +# Ubuntu 22.04 +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +xencpu +zfs_arc +zookeeper From 0499b6b84e9cd6d9f0a48c7fb4af7f93fe2f0610 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:20:03 +0100 Subject: [PATCH 14/18] .expected-plugins/ubuntu20.04: Import expected plugins list. --- .expected-plugins/ubuntu20.04 | 115 ++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/.expected-plugins/ubuntu20.04 b/.expected-plugins/ubuntu20.04 index e69de29bb2..0d4d38af33 100644 --- a/.expected-plugins/ubuntu20.04 +++ b/.expected-plugins/ubuntu20.04 @@ -0,0 +1,115 @@ +# Ubuntu 20.04 +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +tokyotyrant +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +xencpu +zfs_arc +zookeeper From cc03d9dfc8a4d685107fcc577bf800b273bb3612 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:21:22 +0100 Subject: [PATCH 15/18] .expected-plugins/fedora38: Import expected plugins list. --- .expected-plugins/fedora38 | 111 +++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/.expected-plugins/fedora38 b/.expected-plugins/fedora38 index e69de29bb2..272c9bc59c 100644 --- a/.expected-plugins/fedora38 +++ b/.expected-plugins/fedora38 @@ -0,0 +1,111 @@ +# Fedora 38 +libcollectdclient +apache +apcups +battery +bind +buddyinfo +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdkevents +dpdkstat +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +virt +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +zfs_arc +zookeeper From ebd91cf56bde31d37cad9a5dc2a085567bccb2c0 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 17:22:53 +0100 Subject: [PATCH 16/18] .github/workflows/build.yml: Add "Check expected plugins" to "experimental". --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a9e915ce2..d1bcde27dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,3 +134,8 @@ jobs: path: "*.log" - name: Report check status run: exit $(< make-check.status) + - name: Check expected plugins + run: | + if [[ -e ".expected-plugins/${{ matrix.container_tag }}" ]]; then + /checks/check-built-plugins.sh ".expected-plugins/${{ matrix.container_tag }}" + fi From 19bd4ea18b4d499c6230846d8b0335d29b68af34 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 18:57:31 +0100 Subject: [PATCH 17/18] .expected-plugins/fedora_main: Import expected plugins list. --- .expected-plugins/fedora_main | 108 ++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/.expected-plugins/fedora_main b/.expected-plugins/fedora_main index e69de29bb2..208677daef 100644 --- a/.expected-plugins/fedora_main +++ b/.expected-plugins/fedora_main @@ -0,0 +1,108 @@ +# Fedora Main ("Rawhide") +libcollectdclient +apache +apcups +battery +bind +buddyinfo +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +zfs_arc +zookeeper From 1fa639f617524f955a10e4bd266a5526e683238f Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Dec 2023 20:02:12 +0100 Subject: [PATCH 18/18] .expected-plugins/debian_unstable: Import expected plugins list. --- .expected-plugins/debian_unstable | 111 ++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/.expected-plugins/debian_unstable b/.expected-plugins/debian_unstable index e69de29bb2..7c0a2f135e 100644 --- a/.expected-plugins/debian_unstable +++ b/.expected-plugins/debian_unstable @@ -0,0 +1,111 @@ +# Debian Unstable ("Sid") +libcollectdclient +apache +apcups +battery +bind +buddyinfo +capabilities +ceph +cgroups +chrony +connectivity +conntrack +contextswitch +cpu +cpufreq +cpusleep +curl +curl_json +dbi +df +disk +dns +dpdk_telemetry +drbd +email +entropy +ethstat +exec +fhcount +filecount +fscache +gps +hddtemp +hugepages +infiniband +intel_rdt +interface +ipc +ipmi +iptables +ipvs +irq +load +logfile +log_logstash +logparser +madwifi +mbmon +mcelog +md +mdevents +memcachec +memcached +memory +mmc +multimeter +mysql +netlink +nfs +nginx +notify_desktop +notify_email +notify_nagios +ntpd +numa +nut +olsrd +onewire +openvpn +ovs_events +ovs_stats +pcie_errors +pinba +ping +powerdns +processes +procevent +protocols +sensors +serial +smart +swap +synproxy +sysevent +syslog +table +tail +tail_csv +tcpconns +teamspeak2 +ted +thermal +turbostat +ubi +unixsock +uptime +users +uuid +varnish +vmem +vserver +wireless +write_http +write_influxdb_udp +write_log +write_prometheus +write_stackdriver +xencpu +zfs_arc +zookeeper