Merge "Clean metrics related environments"

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')}"

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:
 #

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: