Commit Graph

59 Commits

Author SHA1 Message Date
Helena McGough 07ae3f81ba Multi-node deployment configuration
- Automated the required configurations for the collectd.conf file
 - Enables the virt and network plugins
 - Included a MULTI_NODE_DEPLOYMENT configuration option for this change
 - This is only enabled when the libvirt.py file is not in use
 - Provided instructions on how to deploy multi-node

Change-Id: I151e318074250b94dbef247e6858c78086fcd362
2017-08-16 12:12:13 +01:00
Elizabeth Burke d256ab054a Deleting ceilometer from the repository
-remove Collectd_Ceilometer folder
-remove Ceilometer specific unit tests
-Remove mentions in devstack, doc, and etc folders
-Substitute refereces of Ceilometer with Gnocchi/Aodh

Closes-Bug: #1710855
Change-Id: I210ca8182c489c4f90a6521b1b7fd6f8a391e602
Signed-off-by: Elizabeth Burke <elizabeth.burke@intel.com>
2017-08-15 16:00:14 +00:00
Helena McGough 7ef22179fa Deprecated the libvirt meter
- Libvirt meter is only enabled if configured
 - Added deployment code
 - Included a reno
 - Updated doc/source/usage.rst
 - Updated unit tests

Change-Id: Ia4eb566e087ff341505896534296e7afd338f98b
2017-08-14 11:38:33 +00:00
Helena McGough 1437e06bf1 Make alarm severity configurable
- Enabled the user to configure the severity of alarms triggered
   by metrics/meters
 - Provided/Updated documentation for this changea
 - Included all of the necessary tests for this change
 - Included a reno for this change

Change-Id: Icefe2edf7695c4a8b3d5838844e2514b9876967f
2017-06-30 10:04:57 +00:00
Jenkins 4f426a9fb4 Merge "Change the extension name of backup .conf files" 2017-05-05 09:49:50 +00:00
Jenkins 5e498d23b4 Merge "Add ADDITIONAL_REQS config option" 2017-05-04 10:21:03 +00:00
Helena McGough b02acc8a4f Change the extension name of backup .conf files
- Renamed the back-up's to .conf.b
  - Provided a reno for this change

Change-Id: I78d364a40515a63ecdb99fe5bd4dbb0010c28512
Closes-bug: #1684579
2017-04-27 16:33:22 +00:00
Jenkins 881e622d20 Merge "Change hostname in collectd.conf" 2017-04-26 17:51:39 +00:00
Thaynara Silva b0e2772f0a Change hostname in collectd.conf
- Add code to match collectd hostname to the system's hostname.
   - Add reno for this bug fix.

Change-Id: I4e4138addc979436de04200ffdedc5f440351116
Closes-Bug: #1680013
2017-04-19 06:40:15 +00:00
Jenkins 30687ce05b Merge "enables experimental collectd ci job" 2017-04-18 13:23:09 +00:00
Michal Ptacek bc326f14d7 enables experimental collectd ci job
- this change will enable testing of collectd-ceilometer-plugin
  in the upstream ci

Change-Id: Ie9e5fc1316e3a4a76945100d977313e8b3540d44
Closes-Bug: #1675072
2017-04-13 10:02:55 +01:00
Michal Ptacek af0cc8bfdf Fix default for GNOCCHI & AODH VERBOSE
Change-Id: I831f68dd4ca591130684b12b715eb91196db6298
Closes-Bug: #1681819
2017-04-11 12:59:11 +01:00
Thaynara Silva 1868b097b2 Add ADDITIONAL_REQS config option
- Define requirements packages in settings.
   - Add COLLECTD_ADDITIONAL_PACKAGES variable.
   - User can define requirements to be installed by using the above
     variable in local.conf
   - Install system requirements and user defined requirements in
     libs/collectd.

Change-Id: If5883aa585be4c6a42e8ffbee9a59ad80de765ae
Closes-Bug: #1675120
2017-04-10 16:52:30 +00:00
Jenkins f9336ca1e1 Merge "Restore .conf files on unstack" 2017-04-10 15:18:49 +00:00
Thaynara Silva 8d6804e9db Add separate verbose config options
Add the following to allow plugin verbosity to be configured separately
  - Add COLLECTD_GNOCCHI_VERBOSE
  - Add COLLECTD_AODH_VERBOSE
  - Set both default to the same value of what
    COLLECTD_CEILOMETER_VERBOSE
  - Update documentation
  - Make changes to sample local.conf file

Change-Id: Ie072cdb42f6075860dbcb5fdab96f3f160139ec2
Closes-Bug: #1676489
2017-04-07 13:19:51 +00:00
Helena McGough a50c877e29 Restore .conf files on unstack
- Remove the .conf files on unstack and create a
    backup folder to store copies of the originals.

Change-Id: I9c999457d0cf96e8a87eec4d1fe7273b3faeab1f
2017-04-03 08:48:32 +00:00
Helena McGough 2899c9d3e5 Add deployment code for collectd-aodh-plugin
- Add code to deploy collectd-aodh-plugin with devStack.
  - Included a reno for this commit.
  - The plugin isn't enabled by default, but documentation has been
    updated to allow it's enablement.

Change-Id: I2b34b115262b92b13a6bbfb51e29802612fa0b9d
2017-03-31 15:43:45 +00:00
Jenkins 216a7e949a Merge "Use trueorfalse function in deployment of collectd-ceilometer" 2017-03-30 13:28:42 +00:00
Petr Fortelny ab32d09587 Use trueorfalse function in deployment of collectd-ceilometer
- Replaced occurances of if x == "True" with the
  trueorfalse function from devstack

Change-Id: Ibaee86ab2073c532bca7520582b849906c7712e4
Related-Bug: #1668201
2017-03-28 16:41:22 +02:00
Emma Foley ebeadb1e8e Change default COLLECTD_BRANCH to 5.7.1 tag for master
- Use a fixed tag on master so that we're tracking changes in
  collectd-ceilometer-plugin only, and not in collectd too.

Change-Id: I9bddb613e8785589887f27b010c136705988ddcc
Closes-Bug: #1673190
2017-03-27 14:05:42 +00:00
Emma Foley 43d86ff1cd Add code to build collectd
- Add option to build collectd from source
  - Clones, builds and installs collectd under the source repo
- Add install_requirements function
- Add config options:
  - COLLECTD_INSTALL_TYPE
  - COLLECTD_REPO
  - COLLECTD_DIR
  - COLLECTD_BRANCH
  - COLLECTD_PREFIX
- Update documentation in doc/source/usage.rst
- Add service file for systemd
- Make sure the config dir is included

Partial-Bug: #1596966
Change-Id: I92156cf69438634c6340c21089538ff7ea716e6f
2017-03-21 15:34:52 +00:00
Jenkins 911961d18a Merge "Add custom unit mapping to Gnocchi" 2017-03-10 17:30:06 +00:00
Jenkins 868a676b95 Merge "Add deployment code for gnocchi" 2017-03-10 17:30:00 +00:00
Jenkins aab8ad09e5 Merge "Requirements for binary installation" 2017-03-10 17:28:24 +00:00
Emma Foley fbf2959d6e Add custom unit mapping to Gnocchi
- Add new UNIT block to sample conf.
- Configure the UNIT block for Gnocchi.
- Add a new config_units function
- Change COLLECTD_CUSTOM_UNITS to COLLECTD_CEILOMETER_CUSTOM_UNITS
- Add COLLECTD_GNOCCHI_CUSTOM_UNITS config option

Change-Id: I93088f2299ac4b5679289b1526febcf5e773be02
2017-03-10 13:30:35 +00:00
Emma Foley fc514f3f0f Add deployment code for gnocchi
- Check if gnocchi/ceilometer services are enabled
- Configures gnocchi service
- Update devstackGSG.rst to remove workaround
  - Modulepath previously needed to be changed manually
- Add COLLECTD_{CEILOMETER,GNOCCHI}_ENABLED option

Change-Id: Ic644f53b53dcdbb92eef2c8ddf7d2888fc308797
2017-03-09 16:58:16 +00:00
Jenkins 1dd391a3de Merge "Fix duplicit collectd logging" 2017-03-02 17:12:24 +00:00
Helena McGough a5ae7b4613 Requirements for binary installation
- Binary installation requires the collectd service to be
    stopped once installed.

Change-Id: Idba586ccf7ae5a5680446f56b4ef60c6279ab3d5
2017-03-02 08:03:18 +00:00
Helena McGough 82c3a9ef1a Check for unsupported distros
- Updated install_requirements to check for and warn users
    of unsupported distros.

Change-Id: I66446be71ef8c3236449cc63c62c1a4fd114c066
2017-02-28 09:53:14 +00:00
Jaroslav Safka 9b2bcf893e Fix duplicit collectd logging
Decrease syslog verbosity when file logging is enabled.

Change-Id: If2c53556914cdc15e6442a264c44c7b9404838e8
Closes-Bug: #1644476
2017-02-14 12:39:21 +00:00
Jenkins 457fb7417e Merge "Install collectd_ceilometer module during deployment" 2017-02-10 15:46:56 +00:00
Emma Foley 5bfb438f1c Load logfile.conf first to help debugging
Conf files in $COLLECTD_CONF_DIR are loaded in alphabetical order.

If there is an error loading the python plugin, the logfile plugin is not
loaded.
To help debugging, the logfile should be loaded first.

Changing logfile.conf to 01-logfile.conf should fix this issue by making
collectd load the logfile.conf first

Closes-Bug: #1657859

Change-Id: I1f748d61d6d9a291bcc32476ac17bb0d60fdc573
2017-02-08 17:38:14 +00:00
Emma Foley 7ff2e4252f Install collectd_ceilometer module during deployment
pip_install collectd_ceilometer module
- Install libvirt-* requirements from the package manager so pip can build

This ensures is actually installed from teh requirements.txt file, in
relation to the related bug.

Change-Id: Iba26b1da863288e789f68646dee6a7f62fd6c160
Partial-Bug: #1644254
2017-02-08 17:00:03 +00:00
Emma Foley 4eab82eb12 Indent bash functions for better readability
Change-Id: I5e3918a234efe9713a7ebf6273e85e917ac70e47
Closes-Bug: #1658113
2017-01-20 15:01:08 +00:00
Emma Foley 4f1d999665 COLLECTD_CUSTOMIZE_UNITS -> COLLECTD_CUSTOM_UNITS
- Change the config variable name.
  - The config variable no longer references ceilometer.
  - It is now clearer that the config variable is for all plugins
  - The variable is a noun instead of a verb, so it's clearer that
    this is something to define, instead of a boolean.

- Update docs
  - Added a clarification on the format of the custom unit definition.
  - Corrected incorrect reference to COLLECTD_CEILOMETER_UNITS in
    devstackGSG.rst and usage.rst

Closes-Bug: #1656877
Change-Id: Ie688397242d57cf0fee6629fafb89afd8899a599
2017-01-16 16:18:50 +00:00
Jenkins 1e64bdeb1e Merge "Re-order logic in plugin.sh" 2017-01-13 20:59:51 +00:00
Emma Foley 2c7862cef3 Use KEYSTONE_SERVICE_URI instead of KEYSTONE_AUTH_URI
- KEYSTONE_AUTH_URI is the admin url
- Use KEYSTONE_SERVICE_URI to access keystone as a service user.

Closes-Bug: #1656063

Change-Id: I957e166931b3dea050d0cee3365250a92ae3a57f
2017-01-12 18:31:14 +00:00
Jenkins a5df9666fb Merge "Added -p flag to mkdir" 2017-01-11 14:04:47 +00:00
Helena McGough 606902c455 DevStack enablement of the collectd-ceilometer custom units feature
- Added deployment code for custom units enablement
      - Updated the DevStack documentation to provide instructions on
        how to enable this feature
      - Editted the collectd-ceilometer-plugin.conf file to enable the
        feature
      - Added a reno for this change

Change-Id: Ia93da4abdf066ba677dcb3ee0e44388c06d97ff5
2017-01-11 10:18:08 +00:00
Helena McGough a2759bcdb1 Added -p flag to mkdir
- Add -p flag when creating configuration directory
 - Added a reno for this bug fix

Closes-Bug: #1648554
Change-Id: I8882738db03675a43911c04aa0172d7d3a55c5f1
2017-01-10 10:10:03 +00:00
Radek Zetik 53015ad86c Configuration of OS_TENANT_NAME
collectd-ceilometer-plugin.conf OS_TENANT_NAME was not set, therefore
was unable to connect to keystone as this value was not set during
deployment.
This change sets OS_TENANT_NAME to SERVICE_TENANT_NAME which is set by
devstack for all projects.

Change-Id: I2fdda934cb48d70bfc7f361a3916630f8aa912f7
Closes-Bug: #1649795
2016-12-14 16:42:25 +00:00
Petr Fortelny b98559c3bc Re-order logic in plugin.sh
- Move collectd installation into install section

Change-Id: I3613c6f167e47f70924c00252dcfdde71ed75eed
Closes-Bug: #1623992
2016-12-13 10:57:14 -05:00
Emma Foley 3e98d4f26a Create separate config files for collectd plugins
- Add collectd-ceilometer-plugin.conf to etc/collectd.conf.d/
- Add logfile.conf to etc/collectd.conf.d/
- Add default values to the collectd-ceilometer-plugin.conf
- Add default values to the logfile.conf
During deployment:
- Add substitutions for the vars

Change-Id: I196367e6f48af94c053b149596c57a735109b9ed
2016-12-05 15:20:43 +00:00
Michal Ptacek 68c6f2cc3e Adding Keystone V3 API support
in master branch keystone v2.0 api is no longer supported, this patch
is introducing v3 api support.

Change-Id: I5ed5f65f34033b6a4c550704bb186dfa8d0fc82c
Closes-Bug: #1614892
2016-11-10 21:22:59 +00:00
Emma Foley 33158cfff2 Add logfle.conf to "restore conf" logic
There is code to remove collectd-ceilometer-plugin.conf when unstacking,
however, the same logic wasn't added when logfile.conf was introduced.

This change adds that logic so that logfile.conf is removed along with
collectd-ceilometer-plugin.conf

Change-Id: Ib100db5603fc22a640fe18002d754ba8b8538041
2016-10-13 21:08:02 +01:00
Emma Foley de5d0375e3 Change settings for ceilometer user in collectd config
When creating the collectd-ceilometer-plugin.conf file,
incorrect values were used

This commit changes the following variables:
- OS_USERNAME "$OS_USERNAME" -> OS_USERNAME "ceilometer"
  the service username is hardcoded, and OS_USERNAME overrides an
  existing variable used by OpenStack

- OS_PASSWORD "$OS_PASSWORD" -> OS_PASSWORD "$SERVICE_PASSWORD"
  these are usually identical for devstack, but can be set differently

- OS_TENANT_NAME "service" -> OS_TENANT_NAME "$SERVICE_TENANT_NAME"
  set to service by default.

This change also removes the code that overwrote the OS_USERNAME
and OS_PASSWORD variables in devstack/settings

Change-Id: I9c8435766aa8448210bf06676f4e06d8fbf3a7a8
Closes-Bug: #1605352
2016-09-24 08:29:31 +00:00
Emma Foley 7dcdb3618f Change default BATCH_SIZE to 1
Change-Id: Ibd6713d8d82c55c6064e3eafcbc50185c69c42c4
Closes-bug: #1594718
2016-09-20 12:11:34 +00:00
Federico Ressi 7bcd8a9e01 Restart and configure collectd log file.
When installing collectd is usually automatically started. If it is
already running, the start operation has no effects. Therfore, to make
any configuration setting effective it has to be instead restarted
(stop + start).

Collectd log file is stored by logfile plugin to stack log folder.
The actual location of this file can be configured.

Verbosity of plugin can be increased to make debug messages visible
when running inside a collectd release compiled without deubgging
support. This option is mainly useful for plugin developers.

Related-Bug: #1606338
Change-Id: I658c1c3837970f3732ea64acd791838ee54c61ac
2016-08-31 15:46:47 +00:00
Sean Mooney 9b56c14d85 fix config generation
- This change qoutes the module name
- This change fixes processing of
  COLLECTD_BATCH_SIZE

Change-Id: I1de49d65351e5973b794eec973efec852d42151b
Closes-Bug: #1607526
2016-07-28 20:58:24 +00:00
Jenkins 30daed6d97 Merge "Make sure the collectd config dir exists" 2016-07-22 14:05:47 +00:00