aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml1
-rw-r--r--baro_tests/collectd.py2
-rw-r--r--docs/release/userguide/docker.userguide.rst6
-rw-r--r--docs/release/userguide/feature.userguide.rst10
-rw-r--r--src/collectd/collectd_sample_configs/intel_pmu.conf1
5 files changed, 16 insertions, 4 deletions
diff --git a/INFO.yaml b/INFO.yaml
index fd8b4db5..3cfe9cf6 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -32,6 +32,7 @@ meetings:
time: # eg: '16:00 UTC'
repositories:
- 'barometer'
+ - 'puppet-barometer'
committers:
- <<: *opnfv_barometer_ptl
- name: 'Maryam Tahhan'
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 2723d320..922403f1 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -867,7 +867,7 @@ def main(bt_logger=None):
compute_ids, plugin_labels, aodh_plugin_labels, results, out_plugins)
for res in results:
- if res[3] is 'False' or 'None':
+ if not res[3]:
logger.error('Some tests have failed or have not been executed')
logger.error('Overall Result is Fail')
return 1
diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst
index 33e060af..b42230e8 100644
--- a/docs/release/userguide/docker.userguide.rst
+++ b/docs/release/userguide/docker.userguide.rst
@@ -427,7 +427,7 @@ Run the InfluxDB docker image
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. code:: bash
- $ sudo docker run -tid --net=host -v /var/lib/influxdb:/var/lib/influxdb -p 8086:8086 -p 25826:25826 opnfv/barometer-influxdb
+ $ sudo docker run -tid -v /var/lib/influxdb:/var/lib/influxdb -p 8086:8086 -p 25826:25826 opnfv/barometer-influxdb
Check your docker image is running
@@ -448,7 +448,7 @@ Connecting to an influxdb instance running on local system and adding own custom
.. code:: bash
- $ sudo docker run -tid --net=host -v /var/lib/grafana:/var/lib/grafana -v ${PWD}/dashboards:/opt/grafana/dashboards \
+ $ sudo docker run -tid -v /var/lib/grafana:/var/lib/grafana -v ${PWD}/dashboards:/opt/grafana/dashboards \
-p 3000:3000 opnfv/barometer-grafana
Connecting to an influxdb instance running on remote system with hostname of someserver and IP address
@@ -456,7 +456,7 @@ of 192.168.121.111
.. code:: bash
- $ sudo docker run -tid --net=host -v /var/lib/grafana:/var/lib/grafana -p 3000:3000 -e \
+ $ sudo docker run -tid -v /var/lib/grafana:/var/lib/grafana -p 3000:3000 -e \
influxdb_host=someserver --add-host someserver:192.168.121.111 opnfv/barometer-grafana
Check your docker image is running
diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index 55a248b9..eeec7a2e 100644
--- a/docs/release/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@ -413,6 +413,7 @@ include:
ReportHardwareCacheEvents true
ReportKernelPMUEvents true
ReportSoftwareEvents true
+ Cores ""
</Plugin>
If you want to monitor Intel CPU specific CPU events, make sure to enable the
@@ -426,12 +427,21 @@ additional two options shown below:
ReportSoftwareEvents true
EventList "$HOME/.cache/pmu-events/GenuineIntel-6-2D-core.json"
HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+ Cores ""
</Plugin>
.. note::
If you set XDG_CACHE_HOME to anything other than the variable above - you will need to modify
the path for the EventList configuration.
+Use "Cores" option to monitor metrics only for configured cores. If an empty string is provided
+as value for this field default cores configuration is applied - that is all available cores
+are monitored separately. To limit monitoring to cores 0-7 set the option as shown below:
+
+.. code:: bash
+
+ Cores "[0-7]"
+
For more information on the plugin parameters, please see:
https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod
diff --git a/src/collectd/collectd_sample_configs/intel_pmu.conf b/src/collectd/collectd_sample_configs/intel_pmu.conf
index db83e4bb..959fb8a1 100644
--- a/src/collectd/collectd_sample_configs/intel_pmu.conf
+++ b/src/collectd/collectd_sample_configs/intel_pmu.conf
@@ -19,4 +19,5 @@ LoadPlugin intel_pmu
ReportSoftwareEvents true
# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+ Cores "[0-4]"
</Plugin>