Streamline rsyslog conf

global/overlay/etc/puppet/modules/soc/manifests/rsyslog/server.pp

@@ -41,16 +41,10 @@ class soc::rsyslog::server(
       require => Package['rsyslog'],
       notify  => Service['rsyslog'],
       ;
-    '/etc/rsyslog.d/10-remote-syslog.conf':
-      ensure  => file,
-      mode    => '0644',
-      content => template('soc/rsyslog/rsyslog-remote.conf.erb'),
-      require => Package['rsyslog'],
-      ;
     '/etc/rsyslog.d/10-remote.conf':
       ensure  => file,
       mode    => '0644',
-      content => template('soc/rsyslog/rsyslog-remote-gelf.conf.erb'),
+      content => template('soc/rsyslog/rsyslog-remote.conf.erb'),
       require => Package['rsyslog'],
       ;
   }

global/overlay/etc/puppet/modules/soc/templates/rsyslog/rsyslog-remote.conf.erb

@@ -21,4 +21,30 @@ action(
 )
 <% end -%>
 <% end -%>
+
+<% if @gelf_graylog_servers != [] -%>
+template(name="gelf" type="list") {
+    constant(value="{\"version\":\"1.1\",")
+    constant(value="\"host\":\"")
+    property(name="hostname")
+    constant(value="\",\"short_message\":\"")
+    property(name="msg" format="json")
+    constant(value="\",\"timestamp\":\"")
+    property(name="timegenerated" dateformat="unixtimestamp")
+    constant(value="\",\"level\":\"")
+    property(name="syslogseverity")
+    constant(value="\"}")
+}
+
+<% @gelf_graylog_servers.each do |server| -%>
+action(
+  type="omfwd"
+  target="<%= server.split(':')[0] %>"
+  port="<%= server.split(':')[1] %>"
+  protocol="udp"
+  template="gelf"
+)
+<% end -%>
+<% end -%>
+
 <% end -%>