rabbitmq backend fixes
diff --git a/collectd/files/backend/amqp.conf b/collectd/files/backend/amqp.conf
index e93026e..edd04ff 100644
--- a/collectd/files/backend/amqp.conf
+++ b/collectd/files/backend/amqp.conf
@@ -1,19 +1,21 @@
+{%- from "linux/map.jinja" import system with context %}
+{%- set backend = salt['pillar.get']('collectd:client:backend:'+backend_name) %}
LoadPlugin amqp
<Plugin "amqp">
<Publish "graphite">
- Host "{{ plugin.host }}"
- Port "{{ plugin.port }}"
- VHost "{{ plugin.virtual_host }}"
- User "{{ plugin.user }}"
- Password "{{ plugin.password }}"
+ Host "{{ backend.host }}"
+ Port "{{ backend.port }}"
+ VHost "{{ backend.virtual_host }}"
+ User "{{ backend.user }}"
+ Password "{{ backend.password }}"
Exchange "metrics"
ExchangeType "amq.topic"
# RoutingKey "metrics"
Persistent true
Format "Graphite"
- GraphitePrefix "{{ pillar.system.system }}_{{ pillar.system.environment }}."
+ GraphitePrefix "{{ system.get('cluster', 'prd') }}_{{ system.get('environment', 'prd') }}."
StoreRates false
</Publish>
</Plugin>
diff --git a/collectd/init.sls b/collectd/init.sls
index 5519f6a..6ecdd09 100644
--- a/collectd/init.sls
+++ b/collectd/init.sls
@@ -1,7 +1,6 @@
-
{%- if pillar.collectd is defined %}
include:
{%- if pillar.collectd.client is defined %}
- collectd.client
{%- endif %}
-{%- endif %}
+{%- endif %}
\ No newline at end of file