aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2021-12-17Merge changes from topic "collectd_6_testing"Emma Foley9-2/+326
* changes: Add a playbook that tests collectd 6 vs collectd5 [docker][ansible] Add a playbook for building the containers Create a flask app to show metrics from collectd
2021-12-17[grafana] Update Dashboard for CPU UsageEmma Foley2-2/+5
After the introduction of the collectd_config roles, for generating configs, some of the configs changed, as they were no longer relying on collectd's defaults. One of these was the cpu plugin, which configured ``ReportPercentage True`` by the config role. The effected the grafana dashboards, because the CPU usage dashboard explicitly selected ``type=cpu``. With the values being reported as percentage, collectd sets the ``type=percent`` for the metrics stored in influx (which grafana retrieves), so the dashboards dodn't have any data to display. By removing the ``type=cpu`` filter, the CPU metrics are once again showing in grafana, and will be shown whether the CPU usage is reported in percentage or the default jiffies. Signed-off-by: "Emma Foley <efoley@redhat.com>" Change-Id: I03a6f01677514d888e7805358855947791ab173c
2021-12-17Add a playbook that tests collectd 6 vs collectd5Emma Foley4-3/+147
The playbook will: * build collectd-6, collectd-latest and flask app containers * generate a set of collectd configs * launch the collectd-6, collectd-latest with the generated configs * run the flask app which has a http_server that receives metrics from collectd v5 and collectd v6 * display the received metrics from both versions of collectd Collectd v5 shows PUTVAL Collectd v6 shows PUTMETRIC The playbook takes the following parameters: * PR (optional) The PRID for an upstream collectd pull request that will be passed to the collectd 6 container build * plugin (optional) The name of the plugin that is bneing ported This will filter the received metrics to show the value passed. Additional updates to existing roles include: * run_collectd parameterises the collectd container name so that the role can be reused for launching multiple collectd containers by passing distinct names. Change-Id: Ia62196c347387d380aae69e14ed0dd8e2c76d9c9 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-12-17[docker][ansible] Add a playbook for building the containersEmma Foley2-0/+93
To run the playbook and build the containers, run:: sudo ansible-playbook docker/ansible/collectd_build.yml Change-Id: I60e044f09c8da53f6d5a56d2aaa7b837b19a0b0b Signed-off-by: Emma Foley <efoley@redhat.com>
2021-12-17Create a flask app to show metrics from collectdEmma Foley4-0/+87
Change-Id: Ief2e99d551809705c0b246a7cae5bd5804f97137 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-12-13Merge "[ansible][logparser] Enable logparser by default in one-click install"Emma Foley2-3/+2
2021-09-13[ansible][logparser] Enable logparser by default in one-click installEmma Foley2-3/+2
Signed-off-by: "Emma Foley <efoley@redhat.com>" Change-Id: I6dd8e166433feab16dd06c9767e58d6d96ca948d
2021-09-13[containers] Use anuket/ namespace for containersEmma Foley5-19/+19
Change-Id: If0bea94be66a2c5b88d88e6c70a4c27a9001a3d9 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-08-30[dpdk] Remove dpdkstats and dpdkevents pluginsEmma Foley3-79/+0
Remove old dpdk plugins, since they are superceeded by dpdk_telemetry plugin. JIRA: https://jira.anuket.io/browse/BAROMETER-183 Change-Id: Ie4abf2b1fe37a2197d9d5dd01820ac8b0d01df6d Signed-off-by: Emma Foley <efoley@redhat.com>
2021-08-30Merge "[ansible] Use collectd_config for virt and rdt"Emma Foley5-67/+16
2021-08-26[ansible] Add unixsock to config_files roleEmma Foley1-0/+6
The unixsock plugin is useful for debugging issues in collectd, and can be used to verify that metrics are being collected without having to create CSV files or log into the container. Typically, the unixsock plugin can be queried using the following syntax:: $ docker exec bar-collectd /opt/collectd/bin/collectdctl -s /var/run/collectd-socket listval Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: Id342fe7659c809f4eec71085ae6572f9d855684c
2021-08-26[ansible] Use collectd_config for virt and rdtEmma Foley5-67/+16
Only one of virt and intel_rdt can be enabled at a time, and the existing checks are based on the existance of a {rdt,virt}.conf file to determine whether the other plugin is enabled. This check needed updating, and is now based on whether the other plugin is in the collectd_plugins value. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I175d60111bf133965e1ecbf3764cb12a25356576
2021-08-26[ansible] Use collectd_config for pluginsEmma Foley31-430/+117
* Update the following plugins to use collectd_config role * capabilities * csv * dpdk_telemetry * exec * hugepages * ipmi * logfile * network * ovs_events * ovs_stats * syslog * uuid * write_kafka * write_prometheus JIRA: BAROMETER-180 Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I2ec9e3c2db2c1d907459b40550012834196f0c65
2021-08-26[ansible] Use collectd_config for default_read_pluginsEmma Foley2-103/+31
Update default_plugins to use the collectd_config role [1] [1] https://github.com/infrawatch/collectd-config-ansible-role JIRA: BAROMETER-180 Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I9ff9bf642b641132771965346d65c95a3d66b996
2021-07-05[docker][experimental] Split the buildEmma Foley1-4/+18
Split the container build into two stages: * builder Builds collectd and containers all the build artifacts * final Containers collectd binary and all the dependencies needed to run. Does not contain build artifacts, which contribute to a very large container size. The main advantage is that the final container is much smaller (~700MB vs 1.2GB). Change-Id: Ia75734096233b7ecab9d81df06084c24bde2bf90 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-01Merge "[ansible] Use collectd_config in config_files role"Emma Foley4-53/+95
2021-07-01Merge "[ansible][default_plugins] Update how the default plugins are enabled"Emma Foley4-37/+25
2021-06-17[ansible] Use collectd_config in config_files roleEmma Foley4-53/+95
* Add tasks to use collectd_config * Move generated configs to combine with existing and additional configs * Move vars to defaults dir Some of the vars are needed for the collectd_config role, and need to be set before the other values are set. JIRA: BAROMETER-180 Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: Id5a8b8289c5e120eae7eb5bcf946c5d4dd9fdd48
2021-06-16[ansible] Update naming master->latest for SNMP templateEmma Foley3-4/+4
* config_files: Rename templates/master to templates/latest Change-Id: I5db6491695bf35a87851f779603dc16454c117d5 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-06-15[ansible][default_plugins] Update how the default plugins are enabledEmma Foley4-37/+25
By adding the "en_default_all" tag to each task in the default_read_import task, there is no need to have different tasks for that tag vs when individual plugin tags are enabled. JIRA: BAROMETER-180 Change-Id: I15cc77959bbd25516e9da10af064abeea5527ea9 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-06-03[docker] Add collectd-6Emma Foley1-2/+3
* Add instruction to docs/ for using docker/barometer-collectd-experimental/Dockerfile to build collectd version 6 * Add a new COLLECTD_FLAVOR to src/collectd/Makefile to configure tags for a collectd 6 build. * Allow passing COLLECTD_CONFIG_CMD_ARGS to the collectd build For testing with new plugins for collectd-6, as un-ported plugins are disabled by default. This new option lets the ./configure command be run with extra args, e.g. --enable-cpu --enable-<my-newly-ported-plugin>, which means that plugin can be enabled for the PR that is being tested. * Update flavor_image_name selection to include collectd-6 Change-Id: I55ee0bbcb5d89357b1ef11ab17c5b029603ecdf7 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-05-27[docker][experimental] Allow COLLECTD_TAG to be passed to container buildEmma Foley1-1/+4
This is an optional build arg that overrides the defaults that are set by COLLECTD_FLAVOR This should let the user pull from an arbitrary collectd branch (e.g. a WIP branch or a PR branch from upstream) Change-Id: I6d0ede2b8b57f28e152e53eddae378ac6c722706 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-05-27[docker] Reduce the number of build steps in containersEmma Foley5-69/+13
* Move collectd_apply_pull_request.sh to src/collectd/, which is where the Makefile expects this script to be anyway * Use ARG instead of ENV in collectd container for COLLECTD_FLAVOR, COLLECTD_PULL_REQUESTS, WITH_DPDK * Move the experimental sample configs to src/collectd The configs are copied into the src/collectd directory within the container anyway, so this skips a step in the container build. * Remove initial package installation in containers Move the installation of these packages to the package install steps in the build script in systems/ instead. * Remove unnecessary WORKDIR command The WORKDIR {repo_dir} is unnecessary, since the following commands are using absolute paths rather than relative paths. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I52b96a651cb5d9b644f11f5407cabf3fb21cb6a9
2021-04-09[ansible][capabilities] Remove the capabilities template from experimentalEmma Foley2-2/+1
Capabilities plugin was interoduced in collectd-5.11, which is part of the barometer-collectd container, so it can be included by default. Change-Id: Ia91d883907025ab8618b39147e14d47a4fc541c3 Signed-off-by: Emma Foley <efoley@redhat.com>
2020-11-24[ansible][dpdk] Disable dpdkstats and dpdkevents by defaultEmma Foley1-0/+3
The dpdk_telemetry plugin superceeds the dpdk{stats,events} plugins, and these cannot be enabled together. Since the stable container on CentOS 8 uses DPDK 19.11, the dpdk_telemetry plugin should be used instead. Change-Id: I20e087b40ff90ba95741aaff641ef1a745d77dd8 Signed-off-by: Emma Foley <efoley@redhat.com>
2020-11-19[container][experimental] Update the collectd_apply_pull_request.shEmma Foley2-9/+10
Updated the script to take the PR list from the environment Updated the container to allow users to pass COLLECTD_PULL_REQUESTS as a build-arg when building the container so they don't have to hard code values to change the PRs that are applied Change-Id: Ie820709d5f57712dc246b6728c772e086e53ab5b Signed-off-by: Emma Foley <efoley@redhat.com>
2020-11-19[container][experimental] Update experimental containerEmma Foley3-105/+5
* Use CentOS 8 instead of CentOS7 * Remove collectd-openstack-plugins * Update the list of PRs that are applied logparser and capabilities were merged * Move the experimental configs to collectd_sample_configs{,-latest} Change-Id: Ic1133ee7172e092ad4713c94886f306bc4d8e6ec Signed-off-by: Emma Foley <efoley@redhat.com>
2020-11-19[container][latest] Rename and update barometer-collectd-latestEmma Foley3-21/+16
Collectd changed the upstream default to main, and Barometer added a few changes to incorporate this. One change was renaming the `barometer-collectd-master` container to `barometer-collectd-latest`, since `barometer-collectd-main` didn't make sense semantically, as we use the stable container as the "main" reference. At the time, we didn't have the changes made in releng to build the new container, so container renaming was paused. Now that the change is merged in releng (and has been for a while), and the containers are being updated, this change should happen, so that the container gets published. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I4ee91c289b9e7477157bea148452be58343dc733
2020-11-19[container][collectd] Update barometer-collectd container for CentOS 8Emma Foley1-10/+7
Update collectd to 5.12 Add in CentOS as base for the barometer-collectd container Remove openstack plugins - they are not used anymore Use packaged DPDK (v18.11 in CentOS 7 amd v19.11 in CentOS 8) Install packages from package manager instead of building libpqos, pmu-tools and librdkafka Combine install commands into one for CentOS8 (systems/centos/8/build_base_machine.sh) These changes reduce the size of the container from 1.7GB to ~825MB. Change-Id: I7e474f9578cdbcc7cce8c4fbc5e297eab89fd371 Signed-off-by: Emma Foley <efoley@redhat.com>
2020-11-11[ansible] remove deprecated filtersEmma Foley6-11/+11
The succeeded and failed checks are no longer supported for use as filters. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: If5bdae81b34c1e63d7a2bda349beee5823e2550d
2020-10-06Enabling dpdk_telemetry pluginJabir Kanhira Kadavathu2-0/+27
Enabling dpdk_telemetry plugin with One Click Install. Added the config. templates and the related Documentation. Signed-off-by: Jabir Kanhira Kadavathu <jabir.kanhira.kadavathu@intel.com> Change-Id: Ibecd96d4102cd76a71d31613879ae57950f5108f
2020-07-14Temperorily revert "Rename collectd container to barometer-collectd-latest"Emma Foley8-17/+17
This reverts commit 59338794c8ae8ff82c00dc14ea47a9279cc213d4. The reason for reverting is that there is not yet a container image available on Dockerhub for barometer-collectd-latest Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: Ia6e37af99787a6c02eb368fc7bfdd9d584716f2b
2020-06-30Rename collectd container to barometer-collectd-latestEmma Foley8-17/+17
Change-Id: I0dfff659b4e05e3e619ea62f1771db79f7a8f0df Signed-off-by: Emma Foley <efoley@redhat.com>
2020-06-30Update collectd tags to use main instead of masterEmma Foley3-5/+5
The branch names have been updated, and main has replaced master, which will no longer be updated. Change-Id: Idfce21554594f15a831c8b7ec769eb85d52068b1 Signed-off-by: Emma Foley <efoley@redhat.com>
2020-05-28Merge "Update SNMP agent config"Emma Foley1-5/+14
2020-05-27Merge changes from topic "container_update"Emma Foley1-1/+1
* changes: [docs] Update Docker install guide Update collectd container to use 5.11
2020-05-25Update SNMP agent configEmma Foley1-5/+14
The one-click install was not working with SNMP. The manual install also wasn't working due to the ``Instance true`` config option in the config. ``Instance true`` is not a valid config option for snmp agent. This option appears in the stable container config, and also in the ansible config, but not in the master container. Removing this unsupported option allows the config to be read and collectd to be started. JIRA: BAROMETER-134 Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: If154b3190d82d1cd3638a9c258d2b48bb0efe9af
2020-05-22Update collectd container to use 5.11Emma Foley1-1/+1
Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I1867ec05011a58b16a0d88bd9bd3fdfd7ac5d2e3
2020-04-15Publish a new Barometer testing containerCédric Ollivier2-0/+39
It's widely based on the former Functest features container. As barometer seems leveraging on python2.7 and depends on Functest, it inherits from opnfv/functest-core:hunter (latest py2 release). pika seems missing in requirements. INSTALLER_IP should be protected (it raises exceptions to the upper program). Change-Id: I50d1cf0a7a1233447245d852f79775c8e9fa8c99 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-01-30Temperarily disable SNMP in one click installEmma Foley1-1/+1
SNMP config has been causing the one click install to fail. Disabling it temperorily so that it doesn't block Iruya release JIRA: BAROMETER-134 Change-Id: Ia7944eb6461497c0cd17a2f7ba5b2c2018ffd2a2 Signed-off-by: Emma Foley <efoley@redhat.com>
2019-12-17Merge "Updates/Fix on Legal/License Headers"Matthias Runge24-30/+184
2019-12-17Updates/Fix on Legal/License Headersjabirkkclt24-30/+184
Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Change-Id: Id29ba83455d2cea21ec634d3e0eee38d84de465b
2019-12-13Merge "Fix the Makefile for intel-cmt-cat so it can be build without errors ↵Matthias Runge1-5/+20
on CentOS 7. Mount the /sys/fs/resctrl from host to container to avoid issues with intel_rdt plugin."
2019-12-12Merge "Add capabilities plugin (PR 3292 on collectd github) to experimental ↵Emma Foley5-0/+68
container. Update one-click install of experimental container to add capabilities plugin."
2019-12-09Fix the Makefile for intel-cmt-cat so it can be build without errors onjabirkkclt1-5/+20
CentOS 7. Mount the /sys/fs/resctrl from host to container to avoid issues with intel_rdt plugin. Change-Id: I04d22fccb950aabbde774c1850a5b44ee57908f5 Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
2019-12-06Add capabilities plugin (PR 3292 on collectd github) to experimental ↵jabirkkclt5-0/+68
container. Update one-click install of experimental container to add capabilities plugin. Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Change-Id: I1753c4d8af279ad9c7de29e7a198dbd8161c516d
2019-12-06Py2 to Py3 migration updates for VES App and the Dockerfilejabirkkclt2-4/+4
Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Change-Id: I2e4934518f46afb060748ab08fd2ea9bfc0271d6
2019-11-25Merge "Format change to align with Influxdb_hosts"Matthias Runge1-1/+1
2019-11-08Moving the collectd version from 5.8 to 5.10jabirkkclt1-1/+1
Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Change-Id: I1579a2bd0ef2280134fc13183ebafeb444b752f9
2019-11-07Format change to align with Influxdb_hostsjabirkkclt1-1/+1
Signed-off-by: jabirkkclt <jabir.kanhira.kadavathu@intel.com> Change-Id: Ie368f2d32ce1291036f6fff95cd13b0dbdeced24