aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/configguide/feature.configuration.rst (renamed from docs/configguide/featureconfig.rst)0
-rw-r--r--docs/configguide/index.rst6
-rw-r--r--docs/index.rst14
-rw-r--r--docs/release/index.rst5
-rw-r--r--docs/requirements/index.rst5
-rw-r--r--docs/userguide/collectd.userguide.rst8
-rw-r--r--docs/userguide/index.rst4
-rw-r--r--src/collectd/Makefile13
-rwxr-xr-xsrc/collectd/include_config.sh9
-rw-r--r--src/fuel-plugin/Dockerfile8
-rwxr-xr-xsrc/fuel-plugin/build-collectd.sh5
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh2
-rwxr-xr-xsrc/fuel-plugin/pre_build_hook15
-rwxr-xr-xsrc/fuel-plugin/vagrant/build_fuel_plugin.sh2
14 files changed, 66 insertions, 30 deletions
diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/feature.configuration.rst
index e7c8d5ce..e7c8d5ce 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/feature.configuration.rst
diff --git a/docs/configguide/index.rst b/docs/configguide/index.rst
index d97583c2..b336d2d5 100644
--- a/docs/configguide/index.rst
+++ b/docs/configguide/index.rst
@@ -2,8 +2,12 @@
.. http://creativecommons.org/licenses/by/4.0
.. Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
+***************************************
+Barometer configuration Guide in OPNFV
+***************************************
+
.. toctree::
:numbered:
:maxdepth: 3
- featureconfig.rst
+ feature.configuration.rst
diff --git a/docs/index.rst b/docs/index.rst
index a6d3b939..9b1c6137 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,7 +7,9 @@ Barometer
=========
:Project: Barometer, https://wiki.opnfv.org/display/fastpath/Barometer+Home
+
:Authors: Maryam Tahhan <maryam.tahhan@intel.com>
+
:History:
========== =====================================================
@@ -16,15 +18,15 @@ Barometer
16.12.2014 Project creation
========== =====================================================
-
-Table of Contents:
-==================
-
.. toctree::
- :maxdepth: 4
+ :maxdepth: 3
:numbered:
./requirements/index.rst
- ./configguide/index.rst
./userguide/index.rst
+ ./configguide/index.rst
./release/index.rst
+
+Indices
+=======
+* :ref:`search`
diff --git a/docs/release/index.rst b/docs/release/index.rst
index 706efe7f..30b2524c 100644
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -2,8 +2,11 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) OPNFV, Intel Corporation and others.
+************************
+Barometer Release Notes
+************************
.. toctree::
- :maxdepth: 4
+ :maxdepth: 3
:numbered:
01-release.rst
diff --git a/docs/requirements/index.rst b/docs/requirements/index.rst
index b36f4513..e5d04896 100644
--- a/docs/requirements/index.rst
+++ b/docs/requirements/index.rst
@@ -2,8 +2,11 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) OPNFV, Intel Corporation and others.
+**********************
+Barometer Requirements
+**********************
.. toctree::
- :maxdepth: 4
+ :maxdepth: 3
:numbered:
01-intro.rst
diff --git a/docs/userguide/collectd.userguide.rst b/docs/userguide/collectd.userguide.rst
index bb625f82..ea09bb1a 100644
--- a/docs/userguide/collectd.userguide.rst
+++ b/docs/userguide/collectd.userguide.rst
@@ -89,7 +89,9 @@ Please note if you are using any Open vSwitch plugins you need to run:
DPDK statistics plugin
-----------------------
Repo: https://github.com/collectd/collectd
+
Branch: master
+
Dependencies: DPDK (http://dpdk.org/)
To build and install DPDK to /usr please see:
@@ -153,7 +155,9 @@ reboot). Pending a merge of https://github.com/collectd/collectd/pull/2073.
Hugepages Plugin
-----------------
Repo: https://github.com/collectd/collectd
+
Branch: master
+
Dependencies: None, but assumes hugepages are configured.
To configure some hugepages:
@@ -197,7 +201,9 @@ https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod
Intel RDT Plugin
-----------------
Repo: https://github.com/collectd/collectd
+
Branch: master
+
Dependencies:
* PQoS/Intel RDT library https://github.com/01org/intel-cmt-cat.git
@@ -490,8 +496,10 @@ Reload
Additional useful plugins
--------------------------
+
Exec Plugin
~~~~~~~~~~~
+
Can be used to show you when notifications are being generated by calling a
bash script that dumps notifications to file. (handy for debug). Modify
/opt/collectd/etc/collectd.conf:
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 5f019181..bf62a43d 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -2,9 +2,9 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) Intel Corporation and OPNFV
-====================
+********************
Barometer user guide
-====================
+********************
.. The feature user guide should provide an OPNFV user with enough information to
.. use the features provided by the feature project in the supported scenarios.
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index a17d1571..6fdd4638 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -24,7 +24,6 @@ include ../mk/master.mk
include ../package-list.mk
WORK_DIR = collectd
-SAMPLE_CONFIG = $(CURDIR)/collectd_sample_configs
TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_TAG).done
BUILD_CMD = ./build.sh
CONFIG_CMD =
@@ -50,14 +49,12 @@ CONFIG_CMD += --enable-threshold
#force_install: force_make
all: force_make
- @echo "Finished making $(WORK_DIR) "
+ @echo "Finished making $(WORK_DIR)"
config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure
$(AT)cd $(WORK_DIR); $(CONFIG_CMD)
@echo "Configure done"
-INSTALL_TARGET = force_install force_make
-
force_make: $(WORK_DIR)/Makefile
$(AT)cd $(WORK_DIR) && git pull $(COLLECTD_URL) $(COLLECTD_TAG)
@echo "git pull done"
@@ -72,11 +69,11 @@ force_install:
$(AT)sed -i -e 's/ExecStart=\/usr\/sbin\/collectd/ExecStart=\/opt\/collectd\/sbin\/collectd/g' /etc/systemd/system/collectd.service
$(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID/g' /etc/systemd/system/collectd.service
$(AT)systemctl daemon-reload
- $(AT)sudo mkdir -p /opt/collectd/etc/collectd.conf.d
- $(AT)sudo cp $(SAMPLE_CONFIG)/* /opt/collectd/etc/collectd.conf.d
$(AT)sudo ./include_config.sh
+ @echo "Make install done"
+
+install: force_install
-install: $(INSTALL_TARGET)
# hard way to clean and clobber
clean:
@@ -108,7 +105,7 @@ $(WORK_DIR):
$(AT)git clone $(COLLECTD_URL)
$(TAG_DONE_FLAG): $(WORK_DIR)
- $(AT)cd $(WORK_DIR); git checkout $(COLLECTD_TAG)
+ $(AT)cd collectd; git checkout $(COLLECTD_TAG)
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
endif
diff --git a/src/collectd/include_config.sh b/src/collectd/include_config.sh
index 95b052f3..1996e96b 100755
--- a/src/collectd/include_config.sh
+++ b/src/collectd/include_config.sh
@@ -1,6 +1,9 @@
#!/bin/bash
COLLECTD_CONF_FILE=/opt/collectd/etc/collectd.conf
+COLLECTD_CONF_DIR=/opt/collectd/etc/collectd.conf.d
INCLUDE_CONF="<Include \"/opt/collectd/etc/collectd.conf.d\">"
+CURR_DIR=`pwd`
+SAMPLE_CONF_DIR=$CURR_DIR/collectd_sample_configs/*
function write_include {
echo $INCLUDE_CONF | sudo tee -a $COLLECTD_CONF_FILE;
@@ -10,3 +13,9 @@ function write_include {
grep -qe '<Include "/opt/collectd/etc/collectd.conf.d">' $COLLECTD_CONF_FILE; [ $? -ne 0 ] && write_include
+`mkdir -p $COLLECTD_CONF_DIR`
+
+for F in $SAMPLE_CONF_DIR; do
+ FILE=$(basename $F)
+ [ -f $COLLECTD_CONF_DIR/$FILE ] && echo "File $COLLECTD_CONF_DIR/$FILE exists" || cp $F $COLLECTD_CONF_DIR
+done
diff --git a/src/fuel-plugin/Dockerfile b/src/fuel-plugin/Dockerfile
new file mode 100644
index 00000000..301d796a
--- /dev/null
+++ b/src/fuel-plugin/Dockerfile
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+FROM ubuntu:16.04
+
+RUN apt-get update -y
+RUN apt-get install -y sudo
+
+ADD ./build-collectd.sh /build-collectd.sh
diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh
index 3eefa635..0ef3136d 100755
--- a/src/fuel-plugin/build-collectd.sh
+++ b/src/fuel-plugin/build-collectd.sh
@@ -64,8 +64,8 @@ sudo apt-get -y install \
cd ${BUILD_HOME}
rm -rf collectd
-git clone https://github.com/collectd/collectd; cd collectd; git checkout 8acc85b
-git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout e5972da
+git clone https://github.com/collectd/collectd; cd collectd; git checkout 797ed5e5bee9ee89361f12e447ffc6ceb6ef79d2
+git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout 549d3caba74210ad762fe8c556801d9c11ab9876
mv debian ..
cd ${BUILD_HOME}/collectd
@@ -73,3 +73,4 @@ cd ${BUILD_HOME}/collectd
debian/rules build || true
debian/rules build
fakeroot debian/rules binary
+cp ${BUILD_HOME}/*.deb /build
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 807e5683..0bcb4008 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -11,7 +11,7 @@ OS_PASSWORD=$4
CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
-apt-get install -y collectd
+apt-get install -y collectd python-dev libpython2.7
rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook
index 9a539934..c0d35d4f 100755
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@ -13,18 +13,19 @@ DIR="$(dirname `readlink -f $0`)"
function build_pkg {
case $1 in
ubuntu)
+ cd ${DIR}
rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
- rm -rf ${DIR}/build; mkdir -p ${DIR}/build; cd ${DIR}/build;
+ rm -rf collectd-ceilometer-plugin
git clone https://github.com/openstack/collectd-ceilometer-plugin
cd collectd-ceilometer-plugin
- git checkout 73372f2eb86c81f12bc10b392f75050a401107db
+ git checkout 73372f2eb86c81f12bc10b392f75050a401107db
tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz
+ cd ..; rm -rf collectd-ceilometer-plugin
- # support collectd with dpdk
- cd ${DIR}/build; ../build-collectd.sh
- cp *.deb ${DIR}/repositories/ubuntu
-
- rm -rf ${DIR}/build
+ # build collectd
+ cd ${DIR}
+ sudo docker build -t collectd_build .
+ sudo docker run -v${DIR}/repositories/ubuntu:/build -t collectd_build /build-collectd.sh
;;
*) echo "Not supported system"; exit 1;;
esac
diff --git a/src/fuel-plugin/vagrant/build_fuel_plugin.sh b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
index 5fdf9c38..ea77b075 100755
--- a/src/fuel-plugin/vagrant/build_fuel_plugin.sh
+++ b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
@@ -1,6 +1,6 @@
#!/bin/bash
sudo apt-get update -y
-sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev git
+sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev git docker.io
sudo gem install fpm
sudo pip install fuel-plugin-builder
cp -r /fuel-plugin /home/vagrant