add support for mutiple log server

README.md

@@ -335,7 +335,18 @@ Transport protocol used by rsyslog. Valid values are 'tcp' and 'udp'
 
 log_server
 ----------
-Server to send logs to if remote_logging is true.
+String or array of server to send logs to if remote_logging is true.
+
+*Example:*
+<pre>
+rsyslog::log_server: 'log'
+</pre>
+_OR_
+<pre>
+rsyslog::log_server:
+  - 'log1'
+  - 'log2'
+</pre>
 
 - *Default*: "log.${::domain}"
 

manifests/init.pp

@@ -424,6 +424,19 @@
   }
   validate_bool($is_log_server_real)
 
+  case type3x($log_server) {
+    'array': {
+      $log_server_real = $log_server
+    }
+    'string': {
+      $log_server_real = any2array($log_server)
+    }
+    default: {
+      fail('rsyslog::log_server must be an array or string.')
+    }
+  }
+  validate_array($log_server_real)
+
   if is_string($remote_logging) == true {
     $remote_logging_bool = str2bool($remote_logging)
   } else {

spec/classes/init_spec.rb

@@ -224,6 +224,26 @@
         it { should contain_file('rsyslog_config').without_content(/^\$ModLoad imtcp.so$/) }
       end
 
+      ['logserver', %w(logserver1 logserver2)].each do |values|
+        context "with remote_logging enabled and log_server=#{values} (as #{values.class})" do
+          let :params do
+            {
+              :remote_logging => true,
+              :log_server     => values,
+            }
+          end
+
+          if values.class == Array
+            values.each do |value|
+              it { should contain_file('rsyslog_config').with_content(/^\*\.\* @@#{value}:514$/) }
+            end
+          else
+            it { should contain_file('rsyslog_config').with_content(/^\*\.\* @@logserver:514$/) }
+          end
+
+        end
+      end
+
       context 'with source_facilities set to an empty string' do
         let :params do
           { :source_facilities => '' }
@@ -1327,4 +1347,53 @@
     end
 
   end
+
+  describe 'variable type and content validations' do
+    # set needed custom facts and variables
+    let :facts do
+      {
+        :kernel                 => 'Linux',
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6.5',
+        :domain                 => 'defaultdomain',
+        :rsyslog_version        => '5.8.10',
+      }
+    end
+    let(:validation_params) do
+      {
+        #:param => 'value',
+      }
+    end
+
+    validations = {
+      'array/string' => {
+        :name    => %w(log_server),
+        :valid   => [%w(ar ray), 'string'],
+        :invalid => [{ 'ha' => 'sh' }, 3, 2.42, true, false],
+        :message => 'must be an array or string',
+      },
+    }
+
+    validations.sort.each do |type, var|
+      var[:name].each do |var_name|
+        var[:valid].each do |valid|
+          context "with #{var_name} (#{type}) set to valid #{valid} (as #{valid.class})" do
+            let(:params) { validation_params.merge({ :"#{var_name}" => valid, }) }
+            it { should compile }
+          end
+        end
+
+        var[:invalid].each do |invalid|
+          context "with #{var_name} (#{type}) set to invalid #{invalid} (as #{invalid.class})" do
+            let(:params) { validation_params.merge({ :"#{var_name}" => invalid, }) }
+            it 'should fail' do
+              expect do
+                should contain_class(subject)
+              end.to raise_error(Puppet::Error, /#{var[:message]}/)
+            end
+          end
+        end
+      end # var[:name].each
+    end # validations.sort.each
+  end # describe 'variable type and content validations'
 end

templates/rsyslog.conf.erb

@@ -87,7 +87,9 @@ $ActionQueueSaveOnShutdown on # save messages to disk on shutdown
 $ActionQueueType LinkedList   # run asynchronously
 $ActionResumeRetryCount -1    # infinite retries if host is down
 <% end -%>
-<%= @source_facilities %> <% if @transport_protocol == 'tcp' -%>@<% end -%>@<%= @log_server -%>:<%= @log_server_port %>
+<% @log_server_real.each do |server| -%>
+<%= @source_facilities %> <% if @transport_protocol == 'tcp' -%>@<% end -%>@<%= server -%>:<%= @log_server_port %>
+<% end -%>
 <% end -%>
 <% if @rsyslog_conf_version_real > 2 -%>