summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-11-11 19:05:11 +0000
committerEmma Foley <efoley@redhat.com>2020-11-19 13:41:50 +0000
commit2847e052aef84d97b674aee3a655c55091844925 (patch)
tree8de8d58d518586b3da45a9ee3ae5f535471e7686 /src
parent26a9cd755e8149c16a16ab9af5b54ca1893484fc (diff)
[container][collectd] Update barometer-collectd container for CentOS 8
Update collectd to 5.12 Add in CentOS as base for the barometer-collectd container Remove openstack plugins - they are not used anymore Use packaged DPDK (v18.11 in CentOS 7 amd v19.11 in CentOS 8) Install packages from package manager instead of building libpqos, pmu-tools and librdkafka Combine install commands into one for CentOS8 (systems/centos/8/build_base_machine.sh) These changes reduce the size of the container from 1.7GB to ~825MB. Change-Id: I7e474f9578cdbcc7cce8c4fbc5e297eab89fd371 Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile14
-rw-r--r--src/package-list.mk7
2 files changed, 9 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile
index 49ce2980..b5494265 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,14 +35,14 @@ with-dpdk:
export WITH_DPDK
include mk/master.mk
+# TODO(elfoley) Later on, we can re-enable build from source as a user configured option
SUBDIRS =
-ifdef WITH_DPDK
-SUBDIRS += dpdk
-endif
-SUBDIRS += libpqos
-SUBDIRS += pmu-tools
-SUBDIRS += librdkafka
+#ifdef WITH_DPDK
+#SUBDIRS += dpdk
+#endif
+#SUBDIRS += libpqos
+#SUBDIRS += pmu-tools
+#SUBDIRS += librdkafka
SUBDIRS += collectd
-SUBDIRS += collectd-openstack-plugins
include mk/make-subsys.mk
diff --git a/src/package-list.mk b/src/package-list.mk
index 27ca3de3..ec64df14 100644
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -15,7 +15,7 @@ PMUTOOLS_URL ?= https://github.com/andikleen/pmu-tools
PMUTOOLS_TAG ?= master
KAFKA_URL ?= https://github.com/edenhill/librdkafka.git
-KAFKA_TAG ?= v0.9.5
+KAFKA_TAG ?= v1.5.2
# collectd section
COLLECTD_URL ?= https://github.com/collectd/collectd
@@ -27,7 +27,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
# set pull requests with experimental features
ifeq ($(COLLECTD_FLAVOR), stable)
# using latest stable release
- COLLECTD_TAG ?= collectd-5.11
+ COLLECTD_TAG ?= collectd-5.12
SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
else
# 'master' and 'experimental' collectd flavors are both using
@@ -40,6 +40,3 @@ ifeq ($(COLLECTD_FLAVOR), experimental)
COLLECTD_USE_EXPERIMENTAL_PR ?= y
endif #end of experimental-branch handling
endif
-
-COLLECTD_OPENSTACK_URL ?= https://github.com/openstack/collectd-openstack-plugins
-COLLECTD_OPENSTACK_TAG ?= stable/pike