From 492816a16637c41176778d0d1703bbafbba59885 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 20 Mar 2019 17:24:08 +0100 Subject: [PATCH] Clean metrics related environments This patch groups all metrics related environment files to single directory and changes it's name to make more sense.It also adds environment file for enabling RabbitMQ monitoring. Co-Authored-By: Nagasai Vinaykumar Kapalavai Change-Id: I8419ef82e79d1e26c7b1fc267feadf909a7978d9 Depends-On: I248859bf0e4b70e3a057e96b5fb74be64f4008ed --- environments/metrics/collect-read-rabbitmq.yaml | 15 +++++++++++++++ .../collectd-standalone.yaml} | 2 +- .../collectd-write-qdr.yaml} | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 environments/metrics/collect-read-rabbitmq.yaml rename environments/{collectd-environment.yaml => metrics/collectd-standalone.yaml} (97%) rename environments/{metrics-collectd-qdr.yaml => metrics/collectd-write-qdr.yaml} (77%) diff --git a/environments/metrics/collect-read-rabbitmq.yaml b/environments/metrics/collect-read-rabbitmq.yaml new file mode 100644 index 0000000000..eca017808f --- /dev/null +++ b/environments/metrics/collect-read-rabbitmq.yaml @@ -0,0 +1,15 @@ + +# This environment file serves for enabling python-collect-rabbitmq and configuring +# it to monitor overcloud RabbitMQ instance + +parameter_defaults: + ControllerExtraConfig: + tripleo::profile::base::metrics::collectd::python_read_plugins: + - python-collectd-rabbitmq + collectd::plugin::python::modules: + collectd_rabbitmq_monitoring: + config: + - host: "%{hiera('rabbitmq::interface')}" + port: "%{hiera('rabbitmq::port')}" + username: "%{hiera('rabbitmq::default_user')}" + password: "%{hiera('rabbitmq::default_pass')}" diff --git a/environments/collectd-environment.yaml b/environments/metrics/collectd-standalone.yaml similarity index 97% rename from environments/collectd-environment.yaml rename to environments/metrics/collectd-standalone.yaml index c2ea90a891..f00c8d0ce4 100644 --- a/environments/collectd-environment.yaml +++ b/environments/metrics/collectd-standalone.yaml @@ -1,5 +1,5 @@ resource_registry: - OS::TripleO::Services::Collectd: ../deployment/metrics/collectd-container-puppet.yaml + OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml # parameter_defaults: # diff --git a/environments/metrics-collectd-qdr.yaml b/environments/metrics/collectd-write-qdr.yaml similarity index 77% rename from environments/metrics-collectd-qdr.yaml rename to environments/metrics/collectd-write-qdr.yaml index 47fe781f29..b754c4dfde 100644 --- a/environments/metrics-collectd-qdr.yaml +++ b/environments/metrics/collectd-write-qdr.yaml @@ -4,8 +4,8 @@ resource_registry: - OS::TripleO::Services::Collectd: ../deployment/metrics/collectd-container-puppet.yaml - OS::TripleO::Services::MetricsQdr: ../deployment/metrics/qdr-container-puppet.yaml + OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml + OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml parameter_defaults: