diff --git a/rabbitmq/files/sensu.conf b/rabbitmq/files/sensu.conf
deleted file mode 100644
index 6868655..0000000
--- a/rabbitmq/files/sensu.conf
+++ /dev/null
@@ -1,156 +0,0 @@
-{%- from "rabbitmq/map.jinja" import server with context -%}
-{%- from "linux/map.jinja" import network with context -%}
-{%- if server.bind.address == '0.0.0.0' %}
-{% if grains.ipv4[0] == '127.0.0.1' %}{% set address =  grains.ipv4[1] %}{% else %}{% set address =  grains.ipv4[0] %}{% endif %}
-{%- else %}
-{%- set address = server.bind.address %}
-{%- endif %}
-local_rabbitmq_server_proc:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C beam.smp -u rabbitmq -c 1:2"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - local-rabbitmq-server
-{%- if server.bind.address == '127.0.0.1' %}
-local_rabbitmq_server_tcp_{{ network.fqdn }}:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_tcp -H 127.0.0.1 -p 5672"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - {{ network.fqdn|replace('.', '-') }}
-{%- else %}
-remote_rabbitmq_server_tcp_{{ network.fqdn }}:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_tcp -H {% if grains.ipv4[0] == '127.0.0.1' %}{{ grains.ipv4[1] }}{% else %}{{ grains.ipv4[0] }}{% endif %} -p 5672"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-{%- endif %}
-{#
-remote_rabbitmq_alive_{{ address }}:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_mistral_alive:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fmistral -u mistral --password {{ server.admin.password }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_murano_alive:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fmurano -u murano --password {{ server.admin.password }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_openstack_alive:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fopenstack -u {{ server.admin.name }} --password {{ server.admin.password }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_compute:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter compute"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_scheduler:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter scheduler"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_engine:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter engine"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_console:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter console"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_cinder_volume:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter cinder-volume"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_conductor:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter conductor"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_overview_metrics:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-overview-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_contrail_device_manager:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --filter device_manager"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_contrail_vnc_config:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --filter vnc_config"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_metrics_openstack_reply:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter reply"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_scheduler:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue scheduler"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_engine:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue engine"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_console:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue console"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_cinder_volume:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue cinder-volume"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_cinder_scheduler:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue cinder-scheduler"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_conductor:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue conductor"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-remote_rabbitmq_queue_compute:
-  command: "PATH=$PATH:/etc/sensu/plugins check-rabbitmq-queue.rb --host {{ address }} --password {{ server.admin.password }} --user {{ server.admin.name }} -w 50 -c 100 --queue compute"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
-#}
\ No newline at end of file
diff --git a/rabbitmq/meta/heka.yml b/rabbitmq/meta/heka.yml
index e69de29..a33f56c 100644
--- a/rabbitmq/meta/heka.yml
+++ b/rabbitmq/meta/heka.yml
@@ -0,0 +1,15 @@
+{%- if pillar.rabbitmq.server is defined %}
+input:
+  logstreamer_rabbitmq:
+	type: "LogstreamerInput"
+	log_directory: "/var/log/rabbitmq"
+	file_match: 'rabbit@.+\.log\.?(?P<Index>\d+)?(.gz)?'
+	priority: ["^Index"]
+	decoder: "rabbitmq"
+	oldest_duration: "168h"
+decoder:
+  rabbitmq:
+    type: "SandboxDecoder"
+    filename: "lua_modules/decoders/rabbitmq.lua"
+    module_directory: "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"
+{% endif %}