Merge branch 'master' into master

Author: itbane

.fixtures.yml

@@ -1,8 +1,7 @@
 ---
 fixtures:
-  forge_modules:
-    concat: "puppetlabs/concat"
-    stdlib: "puppetlabs/stdlib"
-
+  repositories:
+    concat: 'https://github.com/puppetlabs/puppetlabs-concat.git'
+    stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
   symlinks:
     rsyslog: "#{source_dir}"

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v3.2.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v3.2.0) (2018-06-14)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/v3.1.1...v3.2.0)
+
+**Implemented enhancements:**
+
+- Add the ability to create custom properties with 'set' [\#86](https://github.com/voxpupuli/puppet-rsyslog/pull/86) ([dhollinger](https://github.com/dhollinger))
+- Add support to rsyslog::client for providing property\_filters and exp… [\#78](https://github.com/voxpupuli/puppet-rsyslog/pull/78) ([fatmcgav](https://github.com/fatmcgav))
+
+**Merged pull requests:**
+
+- Update code to more cleanly format nested configuration [\#85](https://github.com/voxpupuli/puppet-rsyslog/pull/85) ([dhollinger](https://github.com/dhollinger))
+- drop EOL OSs; fix puppet version range [\#83](https://github.com/voxpupuli/puppet-rsyslog/pull/83) ([bastelfreak](https://github.com/bastelfreak))
+- use gitrepos in .fixtures.yml [\#82](https://github.com/voxpupuli/puppet-rsyslog/pull/82) ([bastelfreak](https://github.com/bastelfreak))
+- Rely on beaker-hostgenerator for docker nodesets [\#79](https://github.com/voxpupuli/puppet-rsyslog/pull/79) ([ekohl](https://github.com/ekohl))
+
 ## [v3.1.1](https://github.com/voxpupuli/puppet-rsyslog/tree/v3.1.1) (2018-03-29)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/v3.1.0...v3.1.1)
@@ -24,10 +40,6 @@ These should not affect the functionality of the module.
 
 - Add docker support for lookup\_tables [\#73](https://github.com/voxpupuli/puppet-rsyslog/pull/73) ([dhollinger](https://github.com/dhollinger))
 
-**Merged pull requests:**
-
-- Release 3.0.0 [\#72](https://github.com/voxpupuli/puppet-rsyslog/pull/72) ([dhollinger](https://github.com/dhollinger))
-
 ## [v3.0.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v3.0.0) (2018-03-21)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/v2.3.2...v3.0.0)
@@ -42,7 +54,6 @@ These should not affect the functionality of the module.
 
 **Merged pull requests:**
 
-- Re-Release 2.3.2 [\#69](https://github.com/voxpupuli/puppet-rsyslog/pull/69) ([dhollinger](https://github.com/dhollinger))
 
 ## [v2.3.2](https://github.com/voxpupuli/puppet-rsyslog/tree/v2.3.2) (2018-03-12)
 
@@ -51,11 +62,8 @@ These should not affect the functionality of the module.
 **Implemented enhancements:**
 
 - Filters require a unique name when used in rulesets. [\#65](https://github.com/voxpupuli/puppet-rsyslog/issues/65)
-- Remove unique name requirement for Filters inside of a Ruleset resource [\#66](https://github.com/voxpupuli/puppet-rsyslog/pull/66) ([dhollinger](https://github.com/dhollinger))
-
-**Fixed bugs:**
-
 - Test travis release fix [\#68](https://github.com/voxpupuli/puppet-rsyslog/pull/68) ([dhollinger](https://github.com/dhollinger))
+- Remove unique name requirement for Filters inside of a Ruleset resource [\#66](https://github.com/voxpupuli/puppet-rsyslog/pull/66) ([dhollinger](https://github.com/dhollinger))
 
 **Merged pull requests:**
 
@@ -72,8 +80,6 @@ These should not affect the functionality of the module.
 
 **Merged pull requests:**
 
-- Release 2.3.1 - fixed [\#63](https://github.com/voxpupuli/puppet-rsyslog/pull/63) ([dhollinger](https://github.com/dhollinger))
-- Release 2.3.1 [\#62](https://github.com/voxpupuli/puppet-rsyslog/pull/62) ([dhollinger](https://github.com/dhollinger))
 
 ## [v2.3.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v2.3.0) (2018-01-24)
 
@@ -89,7 +95,6 @@ These should not affect the functionality of the module.
 
 **Merged pull requests:**
 
-- Release 2.3.0 [\#57](https://github.com/voxpupuli/puppet-rsyslog/pull/57) ([dhollinger](https://github.com/dhollinger))
 - Update documentation around filters [\#56](https://github.com/voxpupuli/puppet-rsyslog/pull/56) ([dhollinger](https://github.com/dhollinger))
 - Property filter operators [\#53](https://github.com/voxpupuli/puppet-rsyslog/pull/53) ([dhollinger](https://github.com/dhollinger))
 
@@ -104,10 +109,8 @@ These should not affect the functionality of the module.
 
 **Merged pull requests:**
 
-- Release 2.2.1 [\#52](https://github.com/voxpupuli/puppet-rsyslog/pull/52) ([dhollinger](https://github.com/dhollinger))
 - Set concat order numeric [\#51](https://github.com/voxpupuli/puppet-rsyslog/pull/51) ([dhollinger](https://github.com/dhollinger))
 - Updated docs to correctly reflect the priority functionality [\#50](https://github.com/voxpupuli/puppet-rsyslog/pull/50) ([dhollinger](https://github.com/dhollinger))
-- release 2.2.0 [\#49](https://github.com/voxpupuli/puppet-rsyslog/pull/49) ([bastelfreak](https://github.com/bastelfreak))
 
 ## [v2.2.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v2.2.0) (2018-01-04)
 
@@ -129,7 +132,6 @@ These should not affect the functionality of the module.
 
 - bump lowest puppet version 4.4.0-\>4.10.9 [\#48](https://github.com/voxpupuli/puppet-rsyslog/pull/48) ([bastelfreak](https://github.com/bastelfreak))
 - Add unit and acceptance tests [\#44](https://github.com/voxpupuli/puppet-rsyslog/pull/44) ([dhollinger](https://github.com/dhollinger))
-- Release 2.1.0 [\#38](https://github.com/voxpupuli/puppet-rsyslog/pull/38) ([dhollinger](https://github.com/dhollinger))
 
 ## [v2.1.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v2.1.0) (2017-12-06)
 
@@ -149,15 +151,16 @@ These should not affect the functionality of the module.
 
 ## [v2.0.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v2.0.0) (2017-12-06)
 
-[Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/1.1.0...v2.0.0)
+[Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/v1.1.0...v2.0.0)
 
 **Merged pull requests:**
 
-- Release 2.0.0 [\#36](https://github.com/voxpupuli/puppet-rsyslog/pull/36) ([dhollinger](https://github.com/dhollinger))
 - Add additional README.md shields [\#35](https://github.com/voxpupuli/puppet-rsyslog/pull/35) ([dhollinger](https://github.com/dhollinger))
 - modulesync 1.5.0 [\#34](https://github.com/voxpupuli/puppet-rsyslog/pull/34) ([dhollinger](https://github.com/dhollinger))
 
-## 1.1.0 (2017-10-17)
+## [v1.1.0](https://github.com/voxpupuli/puppet-rsyslog/tree/v1.1.0) (2017-10-17)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-rsyslog/compare/1.1.0...v1.1.0)
 
 * Feature: Added an `external_service` boolean parameter for allowing puppet-rsyslog to manage configs/logs shared with other processes that may be managed by other modules. (https://github.com/crayfishx/puppet-rsyslog/pull/28)
 
@@ -186,4 +189,4 @@ This release contains many new enhancements and features, and brings the module
 * [Fixed the global params config styling](https://github.com/crayfishx/puppet-rsyslog/pull/13)
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

README.md

@@ -566,7 +566,8 @@ Configures Rsyslog ruleset blocks in rainerscript. There are two elements in the
 * `rules` - the actual content that goes inside the ruleset. Currently the following are supported:
   * `action` - rsyslog actions defined inside of the ruleset.
   * `lookup` - Sets a variable to the results of an rsyslog lookup.
-  * `set` - Set an rsyslog variable
+  * `set` - Set an rsyslog variable or property. Property explicitly requires that the set name be a string beginning with `$!`, while a variable can be a plain string or a string starting with `$.`.
+    * **NOTE: Setting the variable with a string that does NOT begin with `$.` is deprecated and will be removed in the next major release!**
   * `call` - call a specific action.
   * `exec` - execute the following system command
   * `expression_filter` - Filter based on one or more expressions.
@@ -583,10 +584,13 @@ rsyslog::server::rulesets:
       queue.size: '10000'
     rules:
       - set:
-          rcv_time: 'exec_template("s_rcv_time")'
+          # Set a Property with a value from a template.
+          $!rcv_time: 'exec_template("s_rcv_time")'
       - set:
-          utime_gen: 'exec_template("s_unixtime_generated")'
+          # Set a Variable with a value from a template.
+          $.utime_gen: 'exec_template("s_unixtime_generated")'
       - set:
+          # Set a Variable using the deprecated method with a value from $uuid
           uuid: '$uuid'
       - action:
           name: utf8-fix

manifests/client.pp

@@ -1,23 +1,29 @@
 class rsyslog::client (
-  Optional[Hash]  $global_config   = {},
-  Optional[Hash]  $legacy_config   = {},
-  Optional[Hash]  $actions         = {},
-  Optional[Hash]  $inputs          = {},
-  Optional[Hash]  $custom_config   = {},
-  Optional[Hash]  $modules         = {},
-  Optional[Hash]  $lookup_tables   = {},
+  Optional[Hash]  $global_config = {},
+  Optional[Hash]  $legacy_config = {},
+  Optional[Hash]  $actions       = {},
+  Optional[Hash]  $inputs        = {},
+  Optional[Hash]  $custom_config = {},
+  Optional[Hash]  $modules       = {},
+  Optional[Hash]  $lookup_tables = {},
+  Hash $rulesets                 = {},
+  Hash $property_filters         = {},
+  Hash $expression_filters       = {},
 ) {
 
   include rsyslog
 
   class { 'rsyslog::config':
-    global_config => $global_config,
-    legacy_config => $legacy_config,
-    actions       => $actions,
-    inputs        => $inputs,
-    custom_config => $custom_config,
-    modules       => $modules,
-    lookup_tables => $lookup_tables,
+    global_config      => $global_config,
+    legacy_config      => $legacy_config,
+    actions            => $actions,
+    inputs             => $inputs,
+    custom_config      => $custom_config,
+    modules            => $modules,
+    lookup_tables      => $lookup_tables,
+    rulesets           => $rulesets,
+    property_filters   => $property_filters,
+    expression_filters => $expression_filters,
   }
 
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-rsyslog",
-  "version": "3.1.2-rc0",
+  "version": "3.2.1-rc0",
   "author": "Vox Pupuli",
   "summary": "Manage rsyslog v8 configuration",
   "license": "Apache-2.0",
@@ -46,7 +46,6 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]
@@ -62,12 +61,6 @@
       "operatingsystemrelease": [
         "9"
       ]
-    },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "25"
-      ]
     }
   ],
   "dependencies": [
@@ -83,7 +76,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.10.9 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 6.0.0"
     }
   ],
   "data_provider": "hiera"

spec/acceptance/expression_filter_spec.rb

@@ -30,7 +30,7 @@ class { 'rsyslog::server':
     end
 
     describe file('/etc/rsyslog.d/50_rsyslog.conf') do
-      its(:content) { is_expected.to contain('if msg == "test" then {\ncall ruleset\.action\.test\nstop\n\s*}') }
+      its(:content) { is_expected.to contain('if msg == "test" then {\n  call ruleset\.action\.test\n  stop\n\s*}') }
     end
   end
 end

spec/acceptance/ruleset_spec.rb

@@ -37,6 +37,6 @@ class { 'rsyslog::server':
   describe file('/etc/rsyslog.d/50_rsyslog.conf') do
     it { is_expected.to be_file }
     it { is_expected.to be_readable }
-    its(:content) { is_expected.to match(%r{# ruleset_eth0_514_test ruleset\nruleset \(name="ruleset_eth0_514_test"\n\s*queue\.size="10000"\n\) {\n# Property-based Filter\n:msg, contains, "error" {\ncall action\.ruleset\.test\nstop\n\s*}\n\n}}) }
+    its(:content) { is_expected.to match(%r{# ruleset_eth0_514_test ruleset\nruleset \(name="ruleset_eth0_514_test"\n\s*queue\.size="10000"\n\) {\n# Property-based Filter\n:msg, contains, "error" {\n  call action\.ruleset\.test\n  stop\n\s*}\n\n}}) }
   end
 end

spec/classes/client_spec.rb

@@ -13,7 +13,10 @@
         inputs: {},
         custom_config: {},
         modules: {},
-        lookup_tables: {}
+        lookup_tables: {},
+        rulesets: {},
+        property_filters: {},
+        expression_filters: {}
       )
     }
   end

spec/defines/component/expression_filter_spec.rb

@@ -43,15 +43,15 @@
         <<-CONTENT
 # myexpressionfilter
 if msg == "test" then {
-# myaction
+  # myaction
 action(type="omfile"
     name="myaction"
     dynaFile="remoteSyslog"
   )
 
 }
 else {
-# myaction2
+  # myaction2
 action(type="omfwd"
     name="myaction2"
     KeepAlive="on"

spec/defines/component/property_filter_spec.rb

@@ -32,7 +32,7 @@
         <<-CONTENT
 # mypropertyfilter
 :msg, contains, "val" {
-# myaction
+  # myaction
 action(type="omfile"
     name="myaction"
     dynaFile="remoteSyslog"