From b01ffff19d48b020e70ad38495cb95cbe2ee4817 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Thu, 12 Jan 2017 09:28:46 +0000 Subject: fuel: update to use the latest commit Update the collectd commit id used to build the collectd package. This new id includes all the upstreamed plugins for barometer. Add the configuration for the hugepages plugin. Change-Id: Ibb639cfacbad5c69220a9d379836b7126021d0b6 Signed-off-by: Maryam Tahhan Reviewed-by: Ruijing Gou --- src/fuel-plugin/build-collectd.sh | 2 +- src/fuel-plugin/deployment_scripts/install.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh index 72097d20..a4741254 100755 --- a/src/fuel-plugin/build-collectd.sh +++ b/src/fuel-plugin/build-collectd.sh @@ -77,7 +77,7 @@ sudo make install PREFIX=/fuel-plugin/build/qpos cd ${BUILD_HOME} rm -rf collectd -git clone https://github.com/collectd/collectd; cd collectd; git checkout 786a6be461cf58ef2b8c57974cad2a79ba2ee82c +git clone https://github.com/collectd/collectd; cd collectd; git checkout 76fb10bf790e35dd6caca13c4bb5d0f86c517370 git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout 549d3caba74210ad762fe8c556801d9c11ab9876 patch -p1 < /fuel-plugin/enable_pqos.diff cp -r debian .. diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh index efdc926e..93dfcae7 100755 --- a/src/fuel-plugin/deployment_scripts/install.sh +++ b/src/fuel-plugin/deployment_scripts/install.sh @@ -71,4 +71,16 @@ cat << EOF > /etc/collectd/collectd.conf.d/intel-rdt.conf EOF +cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf +LoadPlugin hugepages + + + ReportPerNodeHP true + ReportRootHP true + ValuesPages true + ValuesBytes false + ValuesPercentage false + +EOF + service collectd restart -- cgit 1.2.3-korg