Merge "Enable write_redis plugin for barometer-collectd"

diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh
index 3fe1e72..87f8163 100755 (executable)
--- a/ci/install_dependencies.sh
+++ b/ci/install_dependencies.sh
@@ -29,6 +29,9 @@ sudo yum -y install rpm-build \
        libcap-devel xfsprogs-devel iptables-devel \
        libmemcached-devel gtk2-devel libvirt-devel
 
+# For DMA component
+sudo yum -y install hiredis-devel
+
 # For intel-cmt-cat
 sudo yum -y install wget
 

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 7d30652..670c14f 100644 (file)
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -47,6 +47,7 @@ CONFIG_CMD += --with-libjevents=/usr/local
 CONFIG_CMD += --enable-exec
 CONFIG_CMD += --enable-python
 CONFIG_CMD += --enable-threshold
+CONFIG_CMD += --enable-write_redis
 CONFIG_CMD += --disable-perl
 CONFIG_CMD += --with-librdkafka=/usr
 CONFIG_CMD += --disable-lvm

diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh
index 6873571..7e1cf2d 100755 (executable)
--- a/systems/centos/7/build_base_machine.sh
+++ b/systems/centos/7/build_base_machine.sh
@@ -54,6 +54,7 @@ libvirt-daemon
 mcelog
 wget
 net-snmp-devel
+hiredis-devel
 
 # install epel release required for git-review
 epel-release

diff --git a/systems/fedora/22/build_base_machine.sh b/systems/fedora/22/build_base_machine.sh
index 5662eb4..c0c6146 100755 (executable)
--- a/systems/fedora/22/build_base_machine.sh
+++ b/systems/fedora/22/build_base_machine.sh
@@ -49,6 +49,7 @@ git
 pciutils
 cifs-utils
 socat
+hiredis-devel
 
 # install git-review tool
 git-review

diff --git a/systems/rhel/7/build_base_machine.sh b/systems/rhel/7/build_base_machine.sh
index 85382ae..037f87a 100755 (executable)
--- a/systems/rhel/7/build_base_machine.sh
+++ b/systems/rhel/7/build_base_machine.sh
@@ -54,6 +54,7 @@ libvirt-daemon
 mcelog
 wget
 net-snmp-devel
+hiredis-devel
 
 # install epel release required for git-review
 epel-release