summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/userguide/collectd.userguide.rst20
-rwxr-xr-xsrc/fuel-plugin/build-collectd.sh2
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh18
3 files changed, 35 insertions, 5 deletions
diff --git a/docs/userguide/collectd.userguide.rst b/docs/userguide/collectd.userguide.rst
index c2fa8617..fc270588 100644
--- a/docs/userguide/collectd.userguide.rst
+++ b/docs/userguide/collectd.userguide.rst
@@ -216,10 +216,16 @@ Building and installing PQoS/Intel RDT library:
.. code:: bash
$ git clone https://github.com/01org/intel-cmt-cat.git
- $ cd intel-cmt-cat.git
+ $ cd intel-cmt-cat
$ make
$ make install PREFIX=/usr
+You will need to insert the msr kernel module:
+
+.. code:: bash
+
+ $ modprobe msr
+
Building and installing collectd:
.. code:: bash
@@ -447,6 +453,18 @@ A utility to inject corrected, uncorrected and fatal machine check exceptions
$ cd mce-inject
$ make
$ modprobe mce-inject
+
+Modify the test/corrected script to include the following:
+
+.. code:: bash
+
+ CPU 0 BANK 0
+ STATUS 0xcc00008000010090
+ ADDR 0x0010FFFFFFF
+
+Inject the error:
+.. code:: bash
+
$ ./mce-inject < test/corrected
**Note: the uncorrected and fatal scripts under test will cause a platform reset.
diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh
index a4741254..9e246353 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 76fb10bf790e35dd6caca13c4bb5d0f86c517370
+git clone https://github.com/collectd/collectd; cd collectd; git checkout 36c657e9864856a10c1dba2519a22ab73d68ce76
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 08efca81..98605a19 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -30,8 +30,6 @@ modprobe msr
apt-get install -y --allow-unauthenticated collectd python-dev libpython2.7 mcelog
-echo $MCELOG_SOCKET | sudo tee -a $MCELOG_CONF;
-
cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
<LoadPlugin python>
Globals true
@@ -100,7 +98,8 @@ fi
if [ $enable_mcelog = 'true' ]
then
-cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf
+ echo $MCELOG_SOCKET | sudo tee -a $MCELOG_CONF;
+ cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf
<LoadPlugin mcelog>
Interval 1
</LoadPlugin>
@@ -110,4 +109,17 @@ cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf
EOF
fi
+if [ $enable_ovs_events = 'true' ]
+then
+ ovs-vsctl set-manager ptcp:6640
+ cat << EOF > /etc/collectd/collectd.conf.d/ovs.conf
+<LoadPlugin ovs_events>
+ Interval 1
+</LoadPlugin>
+<Plugin "ovs_events">
+ SendNotification true
+</Plugin>
+EOF
+fi
+
service collectd restart