From: Maryam Tahhan Date: Wed, 26 Jul 2017 13:01:13 +0000 (+0000) Subject: Merge "mibs: add Intel PMU mib file" X-Git-Tag: opnfv-6.0.0~132 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9514d3ad16bc9b00fe63573899b7059651fcaf98;hp=59c7e7605da9ef5841bc78133c94ba1ddb02ef06;p=barometer.git Merge "mibs: add Intel PMU mib file" --- diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst index 45b5d8c4..4d2469c0 100644 --- a/docs/release/userguide/feature.userguide.rst +++ b/docs/release/userguide/feature.userguide.rst @@ -74,6 +74,11 @@ Other plugins existing as a pull request into collectd master: statistics about virtualized guests on a system directly from the hypervisor, without a need to install collectd instance on the guest. +Third party application in Barometer repository: + +* *Open vSwitch PMD stats*: An aplication that retrieves PMD stats from OVS. It is run + through exec plugin. + **Plugins included in the Danube release:** * Hugepages @@ -121,11 +126,14 @@ will be /opt/collectd. Sample configuration files can be found in '/opt/collectd/etc/collectd.conf.d' .. note:: - - If you plan on using the Exec plugin, the plugin requires non-root - user to execute scripts. By default, `collectd_exec` user is used. Barometer - scripts do *not* create this user. It needs to be manually added or exec plugin - configuration has to be changed to use other, existing user before starting - collectd service. + - If you plan on using the Exec plugin (for OVS_PMD_STATS or for executing scripts + on notification generation), the plugin requires a non-root + user to execute scripts. By default, `collectd_exec` user is used in the exec.conf + provided in the sample configurations directory under src/collectd in the Barometer + repo. The scripts *DO NOT* create this user. You need to create this user before you + run build_base_machine.sh. Or modify configuration in the sample configurations + directory under src/collectd to use another existing non root user before running + run build_base_machine.sh. - If you don't want to use one of the Barometer plugins, simply remove the sample config file from '/opt/collectd/etc/collectd.conf.d' @@ -760,6 +768,40 @@ to include: For more information on the plugin parameters, please see: https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod +OVS PMD stats +^^^^^^^^^^^^^^ +Repo: https://gerrit.opnfv.org/gerrit/barometer + +Prequistes: +1. Open vSwitch dependencies are installed. +2. Open vSwitch service is running. +3. Ovsdb-server manager is configured. +You can refer `Open vSwitch Plugins`_ section above for each one of them. + +OVS PMD stats application is run through the exec plugin. + +To configure the OVS PMD stats application you need to modify the exec plugin configuration +to include: + +.. code:: bash + + + Interval 1 + + Exec "user:group" "" + #NotificationExec "nobody" "/usr/lib/collectd/notify.sh" + + +.. note:: Exec plugin configuration has to be changed to use appropriate user before starting collectd service. + +ovs_pmd_stat.sh calls the script for OVS PMD stats application with its argument: + +.. code:: bash + + sudo python /usr/local/src/ovs_pmd_stats.py" "--socket-pid-file" + "/var/run/openvswitch/ovs-vswitchd.pid" + SNMP Agent Plugin ^^^^^^^^^^^^^^^^^ Repo: https://github.com/maryamtahhan/collectd/ diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh index 438c1435..0e56c770 100755 --- a/systems/centos/7/build_base_machine.sh +++ b/systems/centos/7/build_base_machine.sh @@ -52,6 +52,7 @@ gtk2-devel libvirt-devel mcelog wget +net-snmp-devel # install epel release required for git-review epel-release diff --git a/systems/fedora/22/build_base_machine.sh b/systems/fedora/22/build_base_machine.sh index 942c799d..be225117 100755 --- a/systems/fedora/22/build_base_machine.sh +++ b/systems/fedora/22/build_base_machine.sh @@ -34,6 +34,7 @@ kernel-devel kernel-modules-extra pixman-devel openssl-devel +net-snmp-devel # tools curl diff --git a/systems/rhel/7/build_base_machine.sh b/systems/rhel/7/build_base_machine.sh index 583089a5..c5191f73 100755 --- a/systems/rhel/7/build_base_machine.sh +++ b/systems/rhel/7/build_base_machine.sh @@ -52,6 +52,7 @@ gtk2-devel libvirt-devel mcelog wget +net-snmp-devel # install epel release required for git-review epel-release diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh index e1b1c9f3..0dc21d9a 100755 --- a/systems/ubuntu/14.04/build_base_machine.sh +++ b/systems/ubuntu/14.04/build_base_machine.sh @@ -56,6 +56,9 @@ apt-get -y install \ libsensors4-dev \ libsigrok-dev \ libsnmp-dev \ + snmp \ + snmp-mibs-downloader \ + snmpd \ perl \ libtokyocabinet-dev \ libtokyotyrant-dev \ diff --git a/systems/ubuntu/16.04/build_base_machine.sh b/systems/ubuntu/16.04/build_base_machine.sh index 119bca22..ba64ad45 100755 --- a/systems/ubuntu/16.04/build_base_machine.sh +++ b/systems/ubuntu/16.04/build_base_machine.sh @@ -56,6 +56,9 @@ apt-get -y install \ libsigrok-dev \ libsnmp-dev \ libsnmp9-dev \ + snmp \ + snmp-mibs-downloader \ + snmpd \ perl \ libtokyocabinet-dev \ libtokyotyrant-dev \