summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-01-12 09:28:46 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2017-01-18 07:00:07 +0000
commitb01ffff19d48b020e70ad38495cb95cbe2ee4817 (patch)
treeea0f897566a6c42db2bcb3c23ddd07ef5888643d
parent0e6fa52bc096dd598817bf65ad9ba397496aed07 (diff)
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 <maryam.tahhan@intel.com> Reviewed-by: Ruijing Gou <ruijing.guo@intel.com>
-rwxr-xr-xsrc/fuel-plugin/build-collectd.sh2
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh12
2 files changed, 13 insertions, 1 deletions
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
</Plugin>
EOF
+cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf
+LoadPlugin hugepages
+
+<Plugin hugepages>
+ ReportPerNodeHP true
+ ReportRootHP true
+ ValuesPages true
+ ValuesBytes false
+ ValuesPercentage false
+</Plugin>
+EOF
+
service collectd restart