Merge branch 'rhservice'
diff --git a/heka/files/encoder/protobuf.toml b/heka/files/encoder/protobuf.toml
new file mode 100644
index 0000000..6054eb1
--- /dev/null
+++ b/heka/files/encoder/protobuf.toml
@@ -0,0 +1,3 @@
+[protobuf]
+type = "ProtoBuf"
+
diff --git a/metadata/service/server/amqp/shipper.yml b/metadata/service/server/amqp/shipper.yml
index 9ea9c8f..b02d09c 100644
--- a/metadata/service/server/amqp/shipper.yml
+++ b/metadata/service/server/amqp/shipper.yml
@@ -21,6 +21,9 @@
           hostname_keep: TRUE
           tz: Europe/Prague
           type: rsyslog
+      encoder:
+        protobuf:
+          engine: protobuf
       output:
         rabbitmq:
           engine: amqp