aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-08-30Merge "[ansible] Add unixsock to config_files role"Emma Foley3-3/+20
2021-08-30Merge "[ansible] Use collectd_config for plugins"Emma Foley31-430/+117
2021-08-30Merge changes from topic "update_docs"Emma Foley5-151/+141
* changes: [docs] Update config and post-installation guides [docs][userguide] Use literalinclude instead of duplicating the sample configs
2021-08-26[ansible] Add unixsock to config_files roleEmma Foley3-3/+20
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 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 Foley4-104/+45
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-08-26[docs] Update config and post-installation guidesEmma Foley4-6/+86
The configguide was removed previously because it only contained information about using the OPNFV installers, however, now there appears to be no config information about the plugins. The config information for each plugin is included in the user guide in docs/release/userguide/feature.userguide.rst. This change adds in a note to the the config guide on where to look. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I7f71d51846c9116bed3882b96e762ab5d70fdfa4
2021-08-26[docs][userguide] Use literalinclude instead of duplicating the sample configsEmma Foley2-145/+55
This should reduce the inaccuracies, since the sample configs are easier to test, and changes don't have to be sychronised between documents. Change-Id: I92a1937ff0308df25ea3a345f2772027033f0302 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-08-26[docs] Update formatting and linksEmma Foley5-57/+65
* Fix broken links * Update display text for links * Update formatting * Add hyperlink for barometer Change-Id: I472a896a51d2fb5a49a4eaac1aef2bdeeed8d692 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-08-24Merge "[docs] Update/remove reference to OPNFV"Emma Foley4-21/+13
2021-08-12[docs][reno] Update reno to include templateEmma Foley7-10/+61
The template for release notes wasn't conforming to the expected headings. A template was added to the config. To generate a new note (from the base directory in the repo), use:: reno --rel-notes-dir docs/release/release-notes/ new slug-goes-here The release notes are also included as part of the docs build, and the existing releases notes have been renamed accordingly. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I05d1950b37f266bb6eb3515b3660665cfd5c1d8b
2021-08-12[docs] Update/remove reference to OPNFVEmma Foley4-21/+13
* Replace OPNFV with Anuket * Update comments where scenarios, installers, etc are mentioned Change-Id: I41d4f38e2f681914d3549fd7baca0e7d7d86a8a3 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-14[docs] Add reno to help in creating release notesEmma Foley5-0/+27
Reno[1] is used to create release notes. It can be used in conjunction with sphinx to automatically create and publish release notes. In this case it is being added to help with release notes collation at the end of the release cycle. There is a possibility that it can be more fully integrated later, if there is need for it. For the moment, release notes can be outputted using tox:: tox -e docs-releasenotes Release notes can be added to features using:: reno new slug-goes-here where slug-goes-here is combined with a random suffic to create a unique name for the release note. [1] https://docs.openstack.org/reno/latest/ Change-Id: Id7f113fa4817585bb429503ff3491c633a4ce8e2 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-08Merge "[docker][experimental] Split the build"Emma Foley1-4/+18
2021-07-07[ci] Remove disabled packages from the RPMs list.Emma Foley1-8/+0
The following packages are no longer built when creating the RPMs for collectd: * collectd-gps - not buildable on RHEL8 * collectd-lvm - lvmlvapp was deprecated upstream * collectd-modbus - not buildable on RHEL8 * collectd-mqtt - not buildable on RHEL8 * collectd-nut - dependencies deprecated upstream * collectd-ping - not buildable on RHEL 8 * collectd-smart - only buildable on RHEL 7 * collectd-varnish - dependencies deprecated upstream Change-Id: I3d3179b369ebc67d1bd7d16498b5e3131453f57e Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-07[ci][daily] Update barometer-daily job to navigate to correct dirEmma Foley1-1/+0
Remove the ``cd $WORKSPACE`` as it is not needed, and barometer-daily-* expects baroemter-upload-artifact.d expects to be called in ci/ instead of $WORKSPACE Change-Id: Id2291c6708f06c4d99480e0289c092cbd48c844d Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-06[ci][daily] Update ci/barometer-build.shEmma Foley1-2/+1
Remove the cd ci line because the script is now called from that directory Change-Id: If3caf6fc3dbf3ea2155c70b1cf4ee6d0feff30bf Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-06[ci] Update to fix barometer-daily-masterEmma Foley1-1/+0
Remove collectd-gmod from the rpm check Change-Id: I69c9e16004802de26d72532cb27c963865b36a87 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-07-06[ci][gitlab] Update daily master to execute scriptsEmma Foley1-2/+2
Change-Id: I1f17df236a92aafd3ecaf3d0522fbeaf69c02c81 Signed-off-by: Emma Foley <efoley@redhat.com>
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-02Merge "[ci] Update build_rpm scripts"Emma Foley4-26/+114
2021-07-01[ci] Update build_rpm scriptsEmma Foley4-26/+114
* Update to collectd-5.12 * Use systems/$os/$version/build_base_machine.sh to install requirements * Add patch for updating collectd/contrib/redhat/collectd.spec instead of using sed Change-Id: I4be4f5ef116d2e61ef1468b4009fcc7a52d9593a 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-29Merge "[build][centos8] Update versions of dependencies"Emma Foley1-9/+5
2021-06-28Merge "[ci] Move scripts from releng into ci/ for gitlab"Emma Foley2-0/+100
2021-06-28[build][centos8] Update versions of dependenciesSlawomir Strehlau1-9/+5
The varnish and intel-cmt-cat v3.x packages have been flagged as insecure. ``dnf builddep collectd`` was installing the deps for the 5.8 version of collectd from the epel repo, which included these vulnerable packages. The build scripts for centos 8 have been updated to unstall dependencies from opstools instead, which provide a newer version of collectd. Change-Id: I3d2a1496e3524c4bf7bd56ecbd11e7ceeed01f01 Signed-off-by: Slawomir Strehlau <slawomir.strehlau@intel.com> Signed-off-by: Emma Foley <efoley@redhat.com>
2021-06-24[ci] Move scripts from releng into ci/ for gitlabEmma Foley2-0/+100
Gitlab expects the barometer-build.sh and barometer-upload-artifact.sh to be available in the Barometer repo under ci/, these scripts were previously in opnfv/releng [1] for the Jenkins jobs. These scripts have been copied from releng. [1] https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=tree;f=jjb/barometer;h=f8828a9db69e20cb035568f6a33cda03bea09318;hb=refs/heads/master Change-Id: Iaf7b1f8a6c08fce11cf2873a8cea66ef9d6d5170 Signed-off-by: Emma Foley <efoley@redhat.com>
2021-06-24Add release note for KaliEmma Foley2-0/+41
Change-Id: I79907968e1e894fbe6f6373b87acce08d537c0ae Signed-off-by: Emma Foley <efoley@redhat.com>
2021-06-18Merge "Add Gitlab-CI Configuration"Emma Foley1-0/+165
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-16Merge "[ansible] Update naming master->latest for SNMP template"Emma Foley3-4/+4
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-16[ci] Update DPDK package versionEmma Foley1-1/+1
The nominal package for DPDK (19.11-3) is no longer available in CentOS 8. This is causing the container builds to fail [1][2][3] The version has been updated to 20.11. This may cause issues with the dpdkstat and dpdkevents plugins, however, the dpdk_telemetry plugin is preferred over these. The V1 legacy interface, accessed by dpdk_telemetry plugin, is also exposed by DPDK 20.11. So the version can be updated to 20.11. [1] https://build.opnfv.org/ci/view/barometer/job/barometer-collectd-docker-build-push-master/123/console [2] https://build.opnfv.org/ci/view/barometer/job/barometer-collectd-latest-docker-build-push-master/17/console [3] https://build.opnfv.org/ci/view/barometer/job/barometer-collectd-latest-docker-build-push-master/17/console Change-Id: I33690a9694467a39b4f02f239197aa7cae064716 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-07Merge "[docs] Update docs"Matthias Runge10-33/+35
2021-06-04[docs] Update docsEmma Foley10-33/+35
Update references of OPNFV to Anuket Update redirected and invalud links Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: If5663398319c5a0a5c99cff414bc7b2a216218f0
2021-06-03[docker] Add collectd-6Emma Foley4-11/+245
* 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 Foley2-3/+7
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 Foley9-35/+37
* 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-05-10Add Gitlab-CI ConfigurationTrevor Bramwell1-0/+165
This change adda Gitlab-CI configuration for Barometer, mirroring all the jobs currently in Jenkins: Docker build and pushes for containers on merge and tag: - barometer-collectd - barometer-collectd-latest - barometer-collectd-dma - barometer-collectd-grafana - barometer-collectd-influxdb - barometer-collectd-kafka - barometer-collectd-ves - barometer-collectd-snmp Builds on Merge Requests and Merges: - make clobber && make - Documentation builds & publishing Daily Jobs - barometer build & artifact upload - docker run barometer-collectd-tests Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> Change-Id: Ia5f8e33be537cbdd795da456d04cf6b18286c864
2021-04-15Merge "[ansible][capabilities] Remove the capabilities template from ↵Emma Foley2-2/+1
experimental"
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>
2021-04-08[ci] Update repos and packages for centos/8/build_base_machine.shEmma Foley1-3/+4
Issue found blocking the daily container build, due to the PowerTools repos being renamed, and dpdk version being incorrect. https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-latest-docker-build-push-master/11/console https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-latest-docker-build-push-jerma/3/console https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-experimental-docker-build-push-master/25/console https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-experimental-docker-build-push-jerma/3/console https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-docker-build-push-master/117/console https: //build.opnfv.org/ci/view/barometer/job/barometer-collectd-docker-build-push-jerma/3/console Change-Id: Ied653a940f91dcfac32dc23fe17585d385a0275a Signed-off-by: Emma Foley <efoley@redhat.com>
2020-12-01ovs_pmd_stats: bugfix for excessive padding with ovs-vswitchd 2.14.99.sstrehla1-2/+1
Added "strip" call to remove excessive whitespace padding from values Removed trailing newline Signed-off-by: Slawomir Strehlau <slawomir.strehlau@intel.com> Change-Id: I49686d239fcf105a03b2fa1131a506537f2dfe13
2020-11-24[ansible][dpdk] Disable dpdkstats and dpdkevents by defaultEmma Foley2-2/+13
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 Foley3-14/+22
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 Foley5-10/+100
* 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 Foley24-48/+44
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 Foley5-27/+114
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>