From 7362fc1c6d9316f9a1eae951d253e97ffc406fa9 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 5 Feb 2019 11:00:10 +0100 Subject: [PATCH 1/9] add fedora/rawhide specific Dockerfile --- Dockerfile | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b24641..1d884ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,202 @@ -FROM alpine -CMD ["echo", "placeholder image"] +FROM fedora:rawhide + +ADD redhat.sh /redhat.sh +COPY /checks/*.sh /checks/ + +ENV EXTRA_PACKAGES="\ + OpenIPMI-devel \ + dpdk-devel \ + ganglia-devel \ + gpsd-devel \ + gtk2-devel \ + hiredis-devel \ + intel-cmt-cat-devel \ + iproute-devel \ + iptables-devel \ + java-9-openjdk-devel \ + java-devel \ + jpackage-utils \ + libatasmart-devel \ + libcap-devel \ + libcurl-devel \ + libdbi-devel \ + libesmtp-devel \ + libmemcached-devel \ + libmicrohttpd-devel \ + libmnl-devel \ + libmodbus-devel \ + libnotify-devel \ + liboping-devel \ + libpcap-devel \ + librabbitmq-devel \ + librdkafka-devel \ + libsigrok-devel \ + libudev-devel \ + libvirt-devel \ + libxml2-devel \ + lm_sensors-devel \ + lua-devel \ + lvm2-devel \ + mosquitto-devel \ + mysql-devel \ + net-snmp-devel \ + nut-devel \ + openldap-devel \ + owfs-devel \ + perl-ExtUtils-Embed \ + postgresql-devel \ + protobuf-c-devel \ + python-devel \ + python3-devel \ + riemann-c-client-devel \ + rrdtool-devel \ + varnish-libs-devel \ + xen-devel \ + xfsprogs-devel \ + xmms-devel \ + yajl-devel \ +" + +ENV SUPPORTED_PLUGIN_LIST="\ + libcollectdclient \ + aggregation \ + amqp \ + apache \ + apcups \ + ascent \ + battery \ + bind \ + ceph \ + cgroups \ + chrony \ + conntrack \ + contextswitch \ + cpu \ + cpufreq \ + cpusleep \ + csv \ + curl \ + curl_json \ + curl_xml \ + dbi \ + df \ + disk \ + dns \ + dpdkevents \ + dpdkstat \ + drbd \ + email \ + entropy \ + ethstat \ + exec \ + fhcount \ + filecount \ + fscache \ + gmond \ + gps \ + hddtemp \ + hugepages \ + intel_rdt \ + interface \ + ipc \ + ipmi \ + iptables \ + ipvs \ + irq \ + java \ + load \ + log_logstash \ + logfile \ + lua \ + lvm \ + madwifi \ + match_empty_counter \ + match_hashed \ + match_regex \ + match_timediff \ + match_value \ + mbmon \ + mcelog \ + md \ + memcachec \ + memcached \ + memory \ + 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 \ + perl \ + pinba \ + ping \ + postgresql \ + powerdns \ + processes \ + protocols \ + python \ + redis \ + rrdcached \ + rrdtool \ + sensors \ + serial \ + smart \ + snmp \ + snmp_agent \ + statsd \ + swap \ + synproxy \ + syslog \ + table \ + tail \ + tail_csv \ + target_notification \ + target_replace \ + target_scale \ + target_set \ + target_v5upgrade \ + tcpconns \ + teamspeak2 \ + ted \ + thermal \ + threshold \ + turbostat \ + unixsock \ + uptime \ + users \ + uuid \ + varnish \ + virt \ + vmem \ + vserver \ + wireless \ + write_graphite \ + write_http \ + write_kafka \ + write_log \ + write_prometheus \ + write_redis \ + write_riemann \ + write_sensu \ + write_tsdb \ + xencpu \ + xmms \ + zfs_arc \ + zookeeper \ +" + +RUN /redhat.sh From de936354cf48a6f31291e4045fd7abf68ffe40be Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 5 Feb 2019 12:00:39 +0100 Subject: [PATCH 2/9] rawhide: install default openjdk version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d884ae..7bed1ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ENV EXTRA_PACKAGES="\ intel-cmt-cat-devel \ iproute-devel \ iptables-devel \ - java-9-openjdk-devel \ + java-openjdk-devel \ java-devel \ jpackage-utils \ libatasmart-devel \ From 81ee09acc909c37507ed9a4a394804fee3eae7c2 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Fri, 20 Sep 2019 13:07:57 +0200 Subject: [PATCH 3/9] Fedora rawhide, java-openjdk-devel was renamed --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bed1ea..183b9c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,7 @@ ENV EXTRA_PACKAGES="\ intel-cmt-cat-devel \ iproute-devel \ iptables-devel \ - java-openjdk-devel \ - java-devel \ + java-latest-openjdk-devel \ jpackage-utils \ libatasmart-devel \ libcap-devel \ From 2099b8bd981d43ba1da57bc438fdfcfb12e72306 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Tue, 21 Sep 2021 14:44:18 +0200 Subject: [PATCH 4/9] xmms-devel was removed from fedora rawhide --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 183b9c0..aa89d0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,6 @@ ENV EXTRA_PACKAGES="\ varnish-libs-devel \ xen-devel \ xfsprogs-devel \ - xmms-devel \ yajl-devel \ " @@ -193,7 +192,6 @@ ENV SUPPORTED_PLUGIN_LIST="\ write_sensu \ write_tsdb \ xencpu \ - xmms \ zfs_arc \ zookeeper \ " From 81adb9b6848aa12dc73fbfa6e49a8eefe07437de Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 15 Feb 2022 15:58:12 +0000 Subject: [PATCH 5/9] Install bzip into container images bzip2 is required for make distcheck --- debian.sh | 1 + redhat.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/debian.sh b/debian.sh index 0da789f..4dd696d 100755 --- a/debian.sh +++ b/debian.sh @@ -5,6 +5,7 @@ COMMON_PACKAGES="\ automake \ autotools-dev \ bison \ + bzip2 \ clang \ cpp \ dpkg-dev \ diff --git a/redhat.sh b/redhat.sh index 5439e29..3641489 100755 --- a/redhat.sh +++ b/redhat.sh @@ -4,6 +4,7 @@ COMMON_PACKAGES="\ autoconf \ automake \ bison \ + bzip2 \ clang \ cpp \ curl \ From 9ca789e9abd8de72cec075ab8f904dbcafbd17d5 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Thu, 28 Apr 2022 20:34:05 +0200 Subject: [PATCH 6/9] Adjust package names mysql-devel is named mariadb-devel and python is indeed python3 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa89d0a..97d24eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ENV EXTRA_PACKAGES="\ lua-devel \ lvm2-devel \ mosquitto-devel \ - mysql-devel \ + mariadb-devel \ net-snmp-devel \ nut-devel \ openldap-devel \ @@ -45,7 +45,6 @@ ENV EXTRA_PACKAGES="\ perl-ExtUtils-Embed \ postgresql-devel \ protobuf-c-devel \ - python-devel \ python3-devel \ riemann-c-client-devel \ rrdtool-devel \ From 87ce2645fafcf65a7e8af36b7bd591d9750af1f0 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Mon, 24 Apr 2023 08:29:37 +0200 Subject: [PATCH 7/9] Remove conflicting java package --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97d24eb..01ac277 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,6 @@ ENV EXTRA_PACKAGES="\ intel-cmt-cat-devel \ iproute-devel \ iptables-devel \ - java-latest-openjdk-devel \ - jpackage-utils \ libatasmart-devel \ libcap-devel \ libcurl-devel \ @@ -49,7 +47,6 @@ ENV EXTRA_PACKAGES="\ riemann-c-client-devel \ rrdtool-devel \ varnish-libs-devel \ - xen-devel \ xfsprogs-devel \ yajl-devel \ " @@ -100,7 +97,6 @@ ENV SUPPORTED_PLUGIN_LIST="\ iptables \ ipvs \ irq \ - java \ load \ log_logstash \ logfile \ @@ -190,7 +186,6 @@ ENV SUPPORTED_PLUGIN_LIST="\ write_riemann \ write_sensu \ write_tsdb \ - xencpu \ zfs_arc \ zookeeper \ " From b4541ad3d9f5efc8f4aa1ed1aaa3b3d7654bda95 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 24 Nov 2023 15:07:37 +0100 Subject: [PATCH 8/9] Pin to Fedora 38. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 01ac277..1961f9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:rawhide +FROM fedora:38 ADD redhat.sh /redhat.sh COPY /checks/*.sh /checks/ From 4ca0af3061b93fcf0d04719c8233bab8c78ee255 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 26 Nov 2023 20:34:17 +0100 Subject: [PATCH 9/9] Update list of expected plugins. The LVM plugin has been removed in collectd/collectd#3309. --- Dockerfile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1961f9a..eb347a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,12 +28,12 @@ ENV EXTRA_PACKAGES="\ librabbitmq-devel \ librdkafka-devel \ libsigrok-devel \ + libtirpc-devel \ libudev-devel \ libvirt-devel \ libxml2-devel \ lm_sensors-devel \ lua-devel \ - lvm2-devel \ mosquitto-devel \ mariadb-devel \ net-snmp-devel \ @@ -60,9 +60,12 @@ ENV SUPPORTED_PLUGIN_LIST="\ ascent \ battery \ bind \ + buddyinfo \ ceph \ cgroups \ + check_uptime \ chrony \ + connectivity \ conntrack \ contextswitch \ cpu \ @@ -90,6 +93,7 @@ ENV SUPPORTED_PLUGIN_LIST="\ gps \ hddtemp \ hugepages \ + infiniband \ intel_rdt \ interface \ ipc \ @@ -98,10 +102,10 @@ ENV SUPPORTED_PLUGIN_LIST="\ ipvs \ irq \ load \ - log_logstash \ logfile \ + log_logstash \ + logparser \ lua \ - lvm \ madwifi \ match_empty_counter \ match_hashed \ @@ -111,9 +115,11 @@ ENV SUPPORTED_PLUGIN_LIST="\ mbmon \ mcelog \ md \ + mdevents \ memcachec \ memcached \ memory \ + mmc \ modbus \ mqtt \ multimeter \ @@ -134,12 +140,14 @@ ENV SUPPORTED_PLUGIN_LIST="\ openvpn \ ovs_events \ ovs_stats \ + pcie_errors \ perl \ pinba \ ping \ postgresql \ powerdns \ processes \ + procevent \ protocols \ python \ redis \ @@ -153,6 +161,7 @@ ENV SUPPORTED_PLUGIN_LIST="\ statsd \ swap \ synproxy \ + sysevent \ syslog \ table \ tail \ @@ -168,6 +177,7 @@ ENV SUPPORTED_PLUGIN_LIST="\ thermal \ threshold \ turbostat \ + ubi \ unixsock \ uptime \ users \ @@ -179,12 +189,15 @@ ENV SUPPORTED_PLUGIN_LIST="\ wireless \ write_graphite \ write_http \ + write_influxdb_udp \ write_kafka \ write_log \ write_prometheus \ write_redis \ write_riemann \ write_sensu \ + write_stackdriver \ + write_syslog \ write_tsdb \ zfs_arc \ zookeeper \