docs: update ves documentation and add steps to run on baremetal nodes

Change-Id: I0dad9b8eee5b9cfcce8999d6ffe66fb32e9a382c
Signed-off-by: gordonkelly <gordon.kelly@intel.com>

6 files changed, 182 insertions, 97 deletions

diff --git a/docs/release/userguide/collectd-ves-guest.conf b/docs/release/userguide/collectd-ves-guest.conf
index 2ed814d5..80d2546f 100644
--- a/docs/release/userguide/collectd-ves-guest.conf
+++ b/docs/release/userguide/collectd-ves-guest.conf
@@ -1,4 +1,11 @@
 LoadPlugin logfile
+LoadPlugin interface
+LoadPlugin memory
+LoadPlugin load
+LoadPlugin disk
+LoadPlugin uuid
+LoadPlugin write_kafka
+
 <Plugin logfile>
   LogLevel info
   File "/opt/collectd/var/log/collectd.log"
@@ -6,20 +13,12 @@ LoadPlugin logfile
   PrintSeverity false
 </Plugin>
 
-LoadPlugin cpu
 <Plugin cpu>
   ReportByCpu true
   ReportByState true
   ValuesPercentage true
 </Plugin>
 
-LoadPlugin interface
-LoadPlugin memory
-LoadPlugin load
-LoadPlugin disk
-LoadPlugin uuid
-
-LoadPlugin write_kafka
 <Plugin write_kafka>
   Property "metadata.broker.list" "localhost:9092"
   <Topic "collectd">
diff --git a/docs/release/userguide/collectd-ves-host.conf b/docs/release/userguide/collectd-ves-host.conf
index 76706b5c..1a03e4e0 100644
--- a/docs/release/userguide/collectd-ves-host.conf
+++ b/docs/release/userguide/collectd-ves-host.conf
@@ -1,20 +1,12 @@
-LoadPlugin logfile
-<Plugin logfile>
-  LogLevel info
-  File "/opt/collectd/var/log/collectd.log"
-  Timestamp true
-  PrintSeverity false
-</Plugin>
+LoadPlugin interface
+LoadPlugin memory
+LoadPlugin disk
 
 LoadPlugin cpu
-
-LoadPlugin virt
-<Plugin virt>
-  Connection "qemu:///system"
-  RefreshInterval 60
-  HostnameFormat uuid
-  PluginInstanceFormat name
-  ExtraStats "cpu_util"
+<Plugin cpu>
+  ReportByCpu true
+  ReportByState true
+  ValuesPercentage true
 </Plugin>
 
 LoadPlugin write_kafka
diff --git a/docs/release/userguide/collectd-ves-hypervisor.conf b/docs/release/userguide/collectd-ves-hypervisor.conf
new file mode 100644
index 00000000..301b0a4d
--- /dev/null
+++ b/docs/release/userguide/collectd-ves-hypervisor.conf
@@ -0,0 +1,26 @@
+LoadPlugin logfile
+LoadPlugin cpu
+LoadPlugin virt
+LoadPlugin write_kafka
+
+<Plugin logfile>
+  LogLevel info
+  File "/opt/collectd/var/log/collectd.log"
+  Timestamp true
+  PrintSeverity false
+</Plugin>
+
+<Plugin virt>
+  Connection "qemu:///system"
+  RefreshInterval 60
+  HostnameFormat uuid
+  PluginInstanceFormat name
+  ExtraStats "cpu_util"
+</Plugin>
+
+<Plugin write_kafka>
+  Property "metadata.broker.list" "localhost:9092"
+  <Topic "collectd">
+    Format JSON
+  </Topic>
+</Plugin>
diff --git a/docs/release/userguide/collectd.ves.userguide.rst b/docs/release/userguide/collectd.ves.userguide.rst
index ea32ceb1..8b666114 100644
--- a/docs/release/userguide/collectd.ves.userguide.rst
+++ b/docs/release/userguide/collectd.ves.userguide.rst
@@ -8,16 +8,26 @@ VES Application User Guide
 
 The Barometer repository contains a python based application for VES (VNF Event
 Stream) which receives the `collectd`_ specific metrics via `Kafka`_ bus,
-normalizes the metric data into the VES message and sends it into the VES
+normalizes the metric data into the VES message format and sends it into the VES
 collector.
 
 The application currently supports pushing platform relevant metrics through the
 additional measurements field for VES.
 
 Collectd has a ``write_kafka`` plugin that sends collectd metrics and values to
-a Kafka Broker. The VES application uses Kafka Consumer to receive metrics
-from the Kafka Broker.
+a Kafka Broker. The VES message formatting application, ves_app.py, receives metrics from
+the Kafka broker, normalises the data to VES message format for forwarding to VES collector.
+The VES message formatting application will be simply referred to as the "VES application"
+within this userguide
 
+The VES application can be run in host mode (baremetal), hypervisor mode (on a host with a hypervisor
+and VMs running) or guest mode(within a VM). The main software blocks that are required to run the
+VES application demo are:
+
+        1. Kafka
+        2. Collectd
+        3. VES Application
+        4. VES Collector
 
 Install Kafka Broker
 --------------------
@@ -85,13 +95,13 @@ Install Kafka Broker
     .. code:: bash
 
         $ sudo pip install kafka-python
-        $ wget "https://archive.apache.org/dist/kafka/0.11.0.0/kafka_2.11-0.11.0.0.tgz"
-        $ tar -xvzf kafka_2.11-0.11.0.0.tgz
-        $ sed -i -- 's/#delete.topic.enable=true/delete.topic.enable=true/' kafka_2.11-0.11.0.0/config/server.properties
-        $ sudo nohup kafka_2.11-0.11.0.0/bin/kafka-server-start.sh \
-          kafka_2.11-0.11.0.0/config/server.properties > kafka_2.11-0.11.0.0/kafka.log 2>&1 &
+        $ wget "https://archive.apache.org/dist/kafka/1.0.0/kafka_2.11-1.0.0.tgz"
+        $ tar -xvzf kafka_2.11-1.0.0.tgz
+        $ sed -i -- 's/#delete.topic.enable=true/delete.topic.enable=true/' kafka_2.11-1.0.0/config/server.properties
+        $ sudo nohup kafka_2.11-1.0.0/bin/kafka-server-start.sh \
+          kafka_2.11-1.0.0/config/server.properties > kafka_2.11-1.0.0/kafka.log 2>&1 &
 
-    .. note:: If Kafka server fails to start, please check if the system IP
+    .. note:: If Kafka server fails to start, please check if the platform IP
         address is associated with the hostname in the static host lookup
         table. If it doesn't exist, use the following command to add it.
 
@@ -108,14 +118,14 @@ Install Kafka Broker
 
     .. code:: bash
 
-        $ echo "Hello, World" | kafka_2.11-0.11.0.0/bin/kafka-console-producer.sh \
+        $ echo "Hello, World" | kafka_2.11-1.0.0/bin/kafka-console-producer.sh \
           --broker-list localhost:9092 --topic TopicTest > /dev/null
 
     Consumer (Receive "Hello World"):
 
     .. code:: bash
 
-        $ kafka_2.11-0.11.0.0/bin/kafka-console-consumer.sh --zookeeper \
+        $ kafka_2.11-1.0.0/bin/kafka-console-consumer.sh --zookeeper \
           localhost:2181 --topic TopicTest --from-beginning --max-messages 1 --timeout-ms 3000
 
 
@@ -162,62 +172,112 @@ Build collectd with Kafka support:
     $ ./configure --with-librdkafka=/usr --without-perl-bindings --enable-perl=no
     $ make && sudo make install
 
-Configure and start collectd. Create ``/opt/collectd/etc/collectd.conf``
-collectd configuration file as following:
+.. note::
+
+   If installing from git repository ``collectd.conf`` configuration file will be located in
+   directory ``/opt/collectd/etc/``. If installing from via a package manager ``collectd.conf``
+   configuration file will be located in directory ``/etc/collectd/``
 
-.. note:: The following collectd configuration file allows user to run VES
-   application in the guest mode. To run the VES in host mode, please follow
-   the `Configure VES in host mode`_ steps.
+Configure and start collectd. Modify Collectd configuration file ``collectd.conf``
+as following:
 
-.. include:: collectd-ves-guest.conf
-   :code: bash
+- Within a VM: `Setup VES application (guest mode)`_
+- On Host with VMs: `Setup VES application (hypervisor mode)`_
+- No Virtualization: `Setup VES application (host mode)`_
 
 Start collectd process as a service as described in :ref:`install-collectd-as-a-service`.
 
+Setup VES application (guest mode)
+----------------------------------
 
-Setup VES Test Collector
-------------------------
+In this mode Collectd runs from within a VM and sends metrics to the VES collector.
 
-.. note:: Test Collector setup is required only for VES application testing
-   purposes.
+.. figure:: ves-app-guest-mode.png
+
+    VES guest mode setup
 
 Install dependencies:
 
 .. code:: bash
 
-    $ sudo pip install jsonschema
+    $ sudo pip install pyyaml python-kafka
 
-Clone VES Test Collector:
+Clone Barometer repo and start the VES application:
 
 .. code:: bash
 
-    $ git clone https://github.com/att/evel-test-collector.git ~/evel-test-collector
+    $ git clone https://gerrit.opnfv.org/gerrit/barometer
+    $ cd barometer/3rd_party/collectd-ves-app/ves_app
+    $ nohup python ves_app.py --events-schema=guest.yaml --config=ves_app_config.conf > ves_app.stdout.log &
 
-Modify VES Test Collector config file to point to existing log directory and
-schema file:
 
-.. code:: bash
+Modify Collectd configuration file ``collectd.conf`` as following:
 
-    $ sed -i.back 's/^\(log_file[ ]*=[ ]*\).*/\1collector.log/' ~/evel-test-collector/config/collector.conf
-    $ sed -i.back 's/^\(schema_file[ ]*=.*\)event_format_updated.json$/\1CommonEventFormat.json/' ~/evel-test-collector/config/collector.conf
+.. include:: collectd-ves-guest.conf
+      :code: bash
 
-Start VES Test Collector:
 
-.. code:: bash
+Start collectd process as a service as described in :ref:`install-collectd-as-a-service`.
 
-    $ cd ~/evel-test-collector/code/collector
-    $ nohup python ./collector.py --config ../../config/collector.conf > collector.stdout.log &
+.. note::
 
+    The above configuration is used for a localhost. The VES application can be
+    configured to use remote VES collector and remote Kafka server. To do
+    so, the IP addresses/host names needs to be changed in ``collector.conf``
+    and ``ves_app_config.conf`` files accordingly.
 
-Setup VES application (guest mode)
-----------------------------------
 
-This mode is used to collect guest VM statistics provided by collectd
-and send those metrics into the VES collector.
+Setup VES application (hypervisor mode)
+----------------------------------------
 
-.. figure:: ves-app-guest-mode.png
+This mode is used to collect hypervisor statistics about guest VMs and to send
+those metrics into the VES collector. Also, this mode collects host statistics
+and send them as part of the guest VES message.
 
-    VES guest mode setup
+.. figure:: ves-app-hypervisor-mode.png
+
+    VES hypervisor mode setup
+
+Running the VES in hypervisor mode looks like steps described in
+`Setup VES application (guest mode)`_ but with the following exceptions:
+
+- The ``hypervisor.yaml`` configuration file should be used instead of ``guest.yaml``
+  file when VES application is running.
+
+- Collectd should be running on hypervisor machine only.
+
+- Addition ``libvirtd`` dependencies needs to be installed on  where
+  collectd daemon is running. To install those dependencies, see :ref:`virt-plugin`
+  section of Barometer user guide.
+
+- The next (minimum) configuration needs to be provided to collectd to be able
+  to generate the VES message to VES collector.
+
+.. note::
+   At least one VM instance should be up and running by hypervisor on the host.
+
+.. include:: collectd-ves-hypervisor.conf
+      :code: bash
+
+
+Start collectd process as a service as described in :ref:`install-collectd-as-a-service`.
+
+.. note::
+
+    The above configuration is used for a localhost. The VES application can be
+    configured to use remote VES collector and remote Kafka server. To do
+    so, the IP addresses/host names needs to be changed in ``collector.conf``
+    and ``ves_app_config.conf`` files accordingly.
+
+
+.. note:: The list of the plugins can be extented depends on your needs.
+
+
+Setup VES application (host mode)
+----------------------------------
+
+This mode is used to collect platform wide metrics and to send those metrics into the VES collector.
+It is most suitable for running within a baremetal platform.
 
 Install dependencies:
 
@@ -229,58 +289,66 @@ Clone Barometer repo and start the VES application:
 
 .. code:: bash
 
-    $ git clone https://gerrit.opnfv.org/gerrit/barometer ~/barometer
-    $ cd ~/barometer/3rd_party/collectd-ves-app/ves_app
-    $ nohup python ves_app.py --events-schema=guest.yaml --config=ves_app_config.conf > ves_app.stdout.log &
+    $ git clone https://gerrit.opnfv.org/gerrit/barometer
+    $ cd barometer/3rd_party/collectd-ves-app/ves_app
+    $ nohup python ves_app.py --events-schema=host.yaml --config=ves_app_config.conf > ves_app.stdout.log &
+
+
+.. figure:: ves-app-host-mode.png
+
+    VES Native mode setup
+
+Modify collectd configuration file ``collectd.conf`` as following:
+
+.. include:: collectd-ves-host.conf
+                    :code: bash
+
+Start collectd process as a service as described in :ref:`install-collectd-as-a-service`.
 
 .. note::
 
     The above configuration is used for a localhost. The VES application can be
-    configured to use remote real VES collector and remote Kafka server. To do
+    configured to use remote VES collector and remote Kafka server. To do
     so, the IP addresses/host names needs to be changed in ``collector.conf``
     and ``ves_app_config.conf`` files accordingly.
 
 
-Configure VES in host mode
---------------------------
+.. note:: The list of the plugins can be extented depends on your needs.
 
-This mode is used to collect hypervisor statistics about guest VMs and to send
-those metrics into the VES collector. Also, this mode collects host statistics
-and send them as part of the guest VES message.
 
-.. figure:: ves-app-host-mode.png
 
-    VES host mode setup
+Setup VES Test Collector
+------------------------
 
-Running the VES in host mode looks like steps described in
-`Setup VES application (guest mode)`_ but with the following exceptions:
+.. note:: Test Collector setup is required only for VES application testing
+   purposes.
 
-- The ``host.yaml`` configuration file should be used instead of ``guest.yaml``
-  file when VES application is running.
+Install dependencies:
 
-- Collectd should be running on host machine only.
+.. code:: bash
 
-- Addition ``libvirtd`` dependencies needs to be installed on a host where
-  collectd daemon is running. To install those dependencies, see :ref:`virt-plugin`
-  section of Barometer user guide.
+    $ sudo pip install jsonschema
 
-- At least one VM instance should be up and running by hypervisor on the host.
+Clone VES Test Collector:
 
-- The next (minimum) configuration needs to be provided to collectd to be able
-  to generate the VES message to VES collector.
+.. code:: bash
+
+    $ git clone https://github.com/att/evel-test-collector.git ~/evel-test-collector
 
-  .. include:: collectd-ves-host.conf
-     :code: bash
+Modify VES Test Collector config file to point to existing log directory and
+schema file:
+
+.. code:: bash
 
-  to apply this configuration, the ``/opt/collectd/etc/collectd.conf`` file
-  needs to be modified based on example above and collectd daemon needs to
-  be restarted using the command below:
+    $ sed -i.back 's/^\(log_file[ ]*=[ ]*\).*/\1collector.log/' ~/evel-test-collector/config/collector.conf
+    $ sed -i.back 's/^\(schema_file[ ]*=.*\)event_format_updated.json$/\1CommonEventFormat.json/' ~/evel-test-collector/config/collector.conf
 
-  .. code:: bash
+Start VES Test Collector:
 
-    $ sudo systemctl restart collectd
+.. code:: bash
 
-.. note:: The list of the plugins can be extented depends on your needs.
+    $ cd ~/evel-test-collector/code/collector
+    $ nohup python ./collector.py --config ../../config/collector.conf > collector.stdout.log &
 
 
 VES application configuration description
@@ -299,7 +367,7 @@ REST resources are of the form::
     {ServerRoot}/eventListener/v{apiVersion}/eventBatch`
 
 Within the VES directory (``3rd_party/collectd-ves-app/ves_app``) there is a
-configuration file called ``ves_app.conf``. The description of the
+configuration file called ``ves_app_conf.conf``. The description of the
 configuration options are described below:
 
 **Domain** *"host"*
@@ -310,10 +378,10 @@ configuration options are described below:
   VES port (default: ``30000``)
 
 **Path** *"path"*
-  Used as the "optionalRoutingPath" element in the REST path (default: empty)
+  Used as the "optionalRoutingPath" element in the REST path (default: ``vendor_event_listener``)
 
 **Topic** *"path"*
-  Used as the "topicName" element in the REST  path (default: empty)
+  Used as the "topicName" element in the REST  path (default: ``example_vnf``)
 
 **UseHttps** *true|false*
   Allow application to use HTTPS instead of HTTP (default: ``false``)
@@ -329,7 +397,7 @@ configuration options are described below:
   Vendor Event Listener (default: ``20``)
 
 **ApiVersion** *version*
-  Used as the "apiVersion" element in the REST path (default: ``5.1``)
+  Used as the "apiVersion" element in the REST path (default: ``3``)
 
 **KafkaPort** *port*
   Kafka Port (Default ``9092``)
diff --git a/docs/release/userguide/ves-app-host-mode.png b/docs/release/userguide/ves-app-host-mode.png
index 5a58787c..5a21d3a8 100644
--- a/docs/release/userguide/ves-app-host-mode.png
+++ b/docs/release/userguide/ves-app-host-mode.png
diff --git a/docs/release/userguide/ves-app-hypervisor-mode.png b/docs/release/userguide/ves-app-hypervisor-mode.png
new file mode 100644
index 00000000..5a58787c
--- /dev/null
+++ b/docs/release/userguide/ves-app-hypervisor-mode.png