diff options
| -rwxr-xr-x | ci/utility/package-list.sh | 2 | ||||
| -rw-r--r-- | docker/barometer-influxdb/Dockerfile | 2 | ||||
| -rw-r--r-- | docs/release/userguide/installguide.oneclick.rst | 11 | ||||
| -rw-r--r-- | src/package-list.mk | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh index 0ca4aea6..cb46c7b1 100755 --- a/ci/utility/package-list.sh +++ b/ci/utility/package-list.sh @@ -24,4 +24,4 @@ CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4 CMTCAT_VERSION="v1.1.0" COLLECTD_REPO=https://github.com/collectd/collectd.git -COLLECTD_BRANCH=collectd-5.8 +COLLECTD_BRANCH=collectd-5.10 diff --git a/docker/barometer-influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile index 2989f631..3d761eb5 100644 --- a/docker/barometer-influxdb/Dockerfile +++ b/docker/barometer-influxdb/Dockerfile @@ -1,4 +1,4 @@ FROM influxdb:1.3.7 -RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.8/src/types.db -O /types.db +RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.10/src/types.db -O /types.db COPY ./influxdb.conf /etc/influxdb/influxdb.conf diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst index 07bc8c1e..6463c23a 100644 --- a/docs/release/userguide/installguide.oneclick.rst +++ b/docs/release/userguide/installguide.oneclick.rst @@ -92,6 +92,7 @@ To install Ansible 2.6.3 on Ubuntu: $ sudo apt-get install python $ sudo apt-get install python-pip $ sudo -H pip install 'ansible==2.6.3' + $ sudo apt-get install git The following steps have been verified with Ansible 2.6.3 on Centos 7.5. To install Ansible 2.6.3 on Centos: @@ -130,12 +131,18 @@ Edit inventory file and add hosts: $barometer_dir/docker/ansible/default.inv [collectd_hosts:vars] install_mcelog=true insert_ipmi_modules=true + #to use master or experimental container set the collectd flavor below + #possible values: stable|master|experimental + flavor=stable [influxdb_hosts] - localhost + #hostname or ip must be used. + #using localhost will cause issues with collectd network plugin. + #hostname [grafana_hosts] - localhost + #NOTE: As per current support, Grafana and Influxdb should be same host. + #hostname [prometheus_hosts] #localhost diff --git a/src/package-list.mk b/src/package-list.mk index 47b90bde..d5fedf73 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -27,7 +27,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd # set pull requests with experimental features ifeq ($(COLLECTD_FLAVOR), stable) # using latest stable release - COLLECTD_TAG ?= collectd-5.8 + COLLECTD_TAG ?= collectd-5.10 SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs else # 'master' and 'experimental' collectd flavors are both using |