diff options
| -rw-r--r-- | baro_tests/collectd.py | 3 | ||||
| -rw-r--r-- | docs/release/userguide/docker.userguide.rst | 24 |
2 files changed, 14 insertions, 13 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py index 3d78762c..2723d320 100644 --- a/baro_tests/collectd.py +++ b/baro_tests/collectd.py @@ -23,6 +23,7 @@ import time import logging import config_server import tests +from distutils import version from opnfv.deployment import factory AODH_NAME = 'aodh' @@ -649,7 +650,7 @@ def mcelog_install(): for node in nodes: if node.is_compute(): centos_release = node.run_cmd('uname -r') - if centos_release not in ('3.10.0-514.26.2.el7.x86_64', '3.10.0-693.17.1.el7.x86_64'): + if version.LooseVersion(centos_release) < version.LooseVersion('3.10.0-514.26.2.el7.x86_64'): logger.info( 'Mcelog will NOT be enabled on node-{}.' + ' Unsupported CentOS release found ({}).'.format( diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst index b422d949..33e060af 100644 --- a/docs/release/userguide/docker.userguide.rst +++ b/docs/release/userguide/docker.userguide.rst @@ -305,17 +305,17 @@ Run the collectd docker image Sample configurations can be found at: https://github.com/opnfv/barometer/tree/master/src/collectd/collectd_sample_configs -To make some changes when the container is running run: +Check your docker image is running .. code:: bash - sudo docker exec -ti opnfv/barometer-collectd /bin/bash + sudo docker ps -Check your docker image is running +To make some changes when the container is running run: .. code:: bash - sudo docker ps + sudo docker exec -ti <CONTAINER ID> /bin/bash Build and Run InfluxDB and Grafana docker images ------------------------------------------------ @@ -429,17 +429,17 @@ Run the InfluxDB docker image $ sudo docker run -tid --net=host -v /var/lib/influxdb:/var/lib/influxdb -p 8086:8086 -p 25826:25826 opnfv/barometer-influxdb -To make some changes when the container is running run: +Check your docker image is running .. code:: bash - sudo docker exec -ti opnfv/barometer-influxdb /bin/bash + sudo docker ps -Check your docker image is running +To make some changes when the container is running run: .. code:: bash - sudo docker ps + sudo docker exec -ti <CONTAINER ID> /bin/bash Run the Grafana docker image ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -459,17 +459,17 @@ of 192.168.121.111 $ sudo docker run -tid --net=host -v /var/lib/grafana:/var/lib/grafana -p 3000:3000 -e \ influxdb_host=someserver --add-host someserver:192.168.121.111 opnfv/barometer-grafana -To make some changes when the container is running run: +Check your docker image is running .. code:: bash - sudo docker exec -ti opnfv/barometer-grafana /bin/bash + sudo docker ps -Check your docker image is running +To make some changes when the container is running run: .. code:: bash - sudo docker ps + sudo docker exec -ti <CONTAINER ID> /bin/bash Connect to <host_ip>:3000 with a browser and log into grafana: admin/admin |