Add collectd support
Change-Id: Icd8174b09922a99d3132e93a8ce5151e7cc51a18
diff --git a/cinder/files/collectd_openstack_cinder.conf b/cinder/files/collectd_openstack_cinder.conf
new file mode 100644
index 0000000..6b2928c
--- /dev/null
+++ b/cinder/files/collectd_openstack_cinder.conf
@@ -0,0 +1,10 @@
+Import "openstack_cinder"
+
+<Module "openstack_cinder">
+ KeystoneUrl "{{ plugin.url }}"
+ Username "{{ plugin.username }}"
+ Password "{{ plugin.password }}"
+ Tenant "{{ plugin.tenant }}"
+ MaxRetries "2"
+ Timeout "20"
+</Module>
diff --git a/cinder/meta/collectd.yml b/cinder/meta/collectd.yml
new file mode 100644
index 0000000..feb837b
--- /dev/null
+++ b/cinder/meta/collectd.yml
@@ -0,0 +1,12 @@
+{%- if pillar.cinder.controller is defined %}
+{%- from "cinder/map.jinja" import controller with context %}
+
+remote_plugin:
+ openstack_cinder:
+ plugin: python
+ template: cinder/files/collectd_openstack_cinder.conf
+ url: "http://{{ controller.identity.host }}:{{ controller.identity.port }}/v{% if controller.identity.get('api_version', 2)|int == 2 %}2.0{% else %}3{% endif %}"
+ username: {{ controller.identity.user }}
+ password: {{ controller.identity.password }}
+ tenant: {{ controller.identity.tenant }}
+{%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index bb1eadc..5f7213c 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
cinder:
_support:
collectd:
- enabled: false
+ enabled: true
heka:
enabled: true
sensu: