(SIMP-5585) Update static assets (#31)

- Update static assets
- Update contribution guide URL in README.rst
- Work around non-idempotency of rsyslog module
  in acceptance tests

SIMP-5585 #comment pupmod-simp-simp_logstash

.ruby-version

@@ -1 +1 @@
-2.1.9
+2.4.4

.travis.yml

@@ -1,16 +1,31 @@
 # The testing matrix considers ruby/puppet versions supported by SIMP and PE:
+#
+# https://puppet.com/docs/pe/2018.1/component_versions_in_recent_pe_releases.html
+# https://puppet.com/misc/puppet-enterprise-lifecycle
+# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
 # ------------------------------------------------------------------------------
-#  release    pup   ruby      eol
-# PE 2016.4   4.7   2.1.9  TBD (LTS)
-# PE 2016.5   4.8   2.1.9  2017-10-31
-# SIMP6.0.0   4.8   2.1.9  TBD
-# PE 2017.1   4.9   2.1.9  2017-10-31
-# PE 2017.2   4.10  2.1.9  TBD
+# Release       Puppet   Ruby   EOL
+# SIMP 6.2      4.10     2.1.9  TBD
+# PE 2016.4     4.10     2.1.9  2018-12-31 (LTS)
+# PE 2017.3     5.3      2.4.4  2018-12-31
+# SIMP 6.3      5.5      2.4.4  TBD***
+# PE 2018.1     5.5      2.4.4  2020-05 (LTS)***
+# PE 2019.0     6.0      2.5.1  2019-08-31^^^
+#
+# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5
+# ^^^ = SIMP doesn't support 6 yet; tests are info-only and allowed to fail
+
 ---
 language: ruby
 cache: bundler
 sudo: false
 
+stages:
+  - check
+  - spec
+  - name: deploy
+    if: 'fork = false AND tag = true'
+
 bundler_args: --without development system_tests --path .vendor
 
 notifications:
@@ -24,14 +39,17 @@ addons:
 before_install:
   - rm -f Gemfile.lock
 
+global:
+  - STRICT_VARIABLES=yes
+
 jobs:
   allow_failures:
-    - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5.0"
+    - name: 'Latest Puppet 6.x (allowed to fail)'
 
   include:
     - stage: check
-      rvm: 2.4.1
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5"
+      rvm: 2.4.4
+      env: PUPPET_VERSION="~> 5.5"
       script:
         - bundle exec rake check:dot_underscore
         - bundle exec rake check:test_file
@@ -41,33 +59,43 @@ jobs:
         - bundle exec rake pkg:create_tag_changelog
         - bundle exec rake lint
         - bundle exec puppet module build
+    - stage: spec
+      name: 'Puppet 4.10 (SIMP 6.2, PE 2016.4)'
+      rvm: 2.1.9
+      env: PUPPET_VERSION="~> 4.10.0"
+      script:
+        - bundle exec rake spec
 
     - stage: spec
-      rvm: 2.4.1
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5.0"
+      name: 'Puppet 5.3 (PE 2017.3)'
+      rvm: 2.4.4
+      env: PUPPET_VERSION="~> 5.3.0"
       script:
         - bundle exec rake spec
 
     - stage: spec
-      rvm: 2.1.9
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.10.0"
+      rvm: 2.4.4
+      name: 'Puppet 5.5 (SIMP 6.3, PE 2018.1)'
+      env: PUPPET_VERSION="~> 5.5.0"
       script:
         - bundle exec rake spec
 
     - stage: spec
-      rvm: 2.1.9
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.9.2"
+      name: 'Latest Puppet 5.x'
+      rvm: 2.4.4
+      env: PUPPET_VERSION="~> 5.0"
       script:
         - bundle exec rake spec
 
     - stage: spec
-      rvm: 2.1.9
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.7.0"
+      name: 'Latest Puppet 6.x (allowed to fail)'
+      rvm: 2.5.1
+      env: PUPPET_VERSION="~>6.0"
       script:
         - bundle exec rake spec
 
     - stage: deploy
-      rvm: 2.4.1
+      rvm: 2.4.4
       script:
         - true
       before_deploy:
@@ -87,5 +115,4 @@ jobs:
             secure: "FKZXbcuKXf5zF2vTxBIh9Dog2pPlC69vZOJIT4Ph1uvmHvRKs/zJf0lbRDBVi4rTCFywwGs1lHrvf+dCda4vO4ZR7m9l65UXNmhkC2FI3SbJT6EG+pBmflJqYvUlITylesI6Z5ymZ8Y7bucGTBtGDv1Sv39CKY6RXsPHsiORuIe5WdGOqsbAqCZq6hGTjl+M+v9YHLFSRUkib6H3rOQiqiU4nC3WBxvMNmgiJ/GVPXk+bPG0AP4gZTdDAN/JjXar6uB3G+NrBFeeEf4vN1IOY1PEpgag9cnhyrx9EWFkUZT+jHjR+o0U6XxROktxkAij3BykqEUn1E5nfG+7zWrW5WmcyRsAKgAg7l51ho7P9+DQKFen9PB++a6PEQ7dwNbB0wr/hUTmQdj5YKB7/+v0gxlbrWQGQJuFaRVGnBwQzYg2h4a8I2LVbpbKMZ8eZavbUuLpi5lhugFKrbjIY2XJPrZevB2Fg5gThkjPk0WElb44jPnFZD+f50Y7J6Y6EEM+BOQrckizRQr02Ex+Atn45tigE+rPDZd6U2C7AsYjqoHlgS06du6A13SSKqVpiOgF8spJAl8Q7R98EzO9QjN3j8r5LiVhUqa3RK4d84vyS2MjFlugc3jtYTcV+57WAmw5C+N75oVa48md0xYrQo5xEQ017oGmfAgKCiqqM3i0SKk="
           on:
             tags: true
-            rvm: 2.4.1
             condition: '($SKIP_FORGE_PUBLISH != true)'

CHANGELOG

@@ -1,3 +1,6 @@
+* Mon Nov 05 2018 Liz Nemsick <lnemsick-simp@gmail.com> - 5.0.2-0
+- Update contribution guide URL in README.rst
+
 * Tue Sep 11 2018 Nicholas Markowski <nicholas.markowski@onyxpoint.com> - 5.0.2-0
 - Updated $app_pki_external_source to accept any string. This matches the
   functionality of pki::copy.

Gemfile

@@ -1,23 +1,20 @@
-# ------------------------------------------------------------------------------
-# NOTE: SIMP Puppet rake tasks support ruby 2.1.9
-# ------------------------------------------------------------------------------
 gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/)
 
 gem_sources.each { |gem_source| source gem_source }
 
 group :test do
   gem 'rake'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION',  '~> 4.0')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION',  '~> 5.5')
   gem 'rspec'
-  gem 'rspec-puppet', ['>= 2.6.11', '< 3.0.0']
+  gem 'rspec-puppet'
   gem 'hiera-puppet-helper'
-  gem 'puppetlabs_spec_helper', '~> 2.7.0'
+  gem 'puppetlabs_spec_helper'
   gem 'metadata-json-lint'
   gem 'puppet-strings'
   gem 'puppet-lint-empty_string-check',   :require => false
   gem 'puppet-lint-trailing_comma-check', :require => false
-  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.1.0')
-  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.2', '< 6.0'])
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.2.0')
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6')
   gem 'facterdb'
 end
 
@@ -29,5 +26,5 @@ end
 group :system_tests do
   gem 'beaker'
   gem 'beaker-rspec'
-  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.10.0')
+  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12.0')
 end

README.rst

@@ -1,4 +1,4 @@
-|License| |Build Status| |SIMP compatibility|
+|License| |CII Best Practices| |Puppet Forge| |Puppet Forge Downloads| |Build Status|
 
 SIMP Logstash Puppet Component Module
 =====================================
@@ -32,17 +32,14 @@ A module to integrate the `upstream logstash module <https://github.com/elastic/
 This is a SIMP component module
 -------------------------------
 
-This module is a component of the `System Integrity Management
-Platform <https://github.com/NationalSecurityAgency/SIMP>`__, a
-compliance oriented framework built on Puppet.
+This module is a component of the
+`System Integrity Management Platform <https://simp-project.com>`__, a
+a compliance-management framework built on Puppet.
 
 If you find any issues, they can be submitted to our
 `JIRA <https://simp-project.atlassian.net/>`__.
 
-Please read our `Contribution
-Guide <https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP>`__
-and visit our `developer
-wiki <https://simp-project.atlassian.net/wiki/display/SD/SIMP+Development+Home>`__.
+Please read our `Contribution Guide <http://simp-doc.readthedocs.io/en/stable/contributors_guide/index.html>`__.
 
 As a component module, this module is not recommended for use outside of a SIMP
 environment but may work with some minor modification.
@@ -242,7 +239,7 @@ This module has only been tested on Red Hat Enterprise Linux 6 and 7 and CentOS
 Development
 -----------
 
-Please see the `SIMP Contribution Guidelines <https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP>`__.
+Please read our `Contribution Guide <http://simp-doc.readthedocs.io/en/stable/contributors_guide/index.html>`__.
 
 Acceptance tests
 ^^^^^^^^^^^^^^^^
@@ -277,9 +274,13 @@ Some environment variables may be useful:
    tests to run on isolated networks.
 
 .. _SIMP IPSec Module: https://github.com/simp/pupmod-simp-libreswan
-.. |License| image:: http://img.shields.io/:license-apache-blue.svg
-   :target: http://www.apache.org/licenses/LICENSE-2.0.html
+.. |License| image:: http://img.shields.io/license-apache-blue.svg
+      :target: http://www.apache.org/licenses/LICENSE-2.0.html
+.. |CII Best Practices| image:: https://bestpractices.coreinfrastructure.org/projects/73/badge
+      :target: https://bestpractices.coreinfrastructure.org/projects/73
+.. |Puppet Forge| image:: https://img.shields.io/puppetforge/v/simp/simp_logstash.svg
+      :target: https://forge.puppetlabs.com/simp/simp_logstash
+.. |Puppet Forge Downloads| image:: https://img.shields.io/puppetforge/dt/simp/simp_logstash.svg
+      :target: https://forge.puppetlabs.com/simp/simp_logstash
 .. |Build Status| image:: https://travis-ci.org/simp/pupmod-simp-simp_logstash.svg
-   :target: https://travis-ci.org/simp/pupmod-simp-simp_logstash
-.. |SIMP compatibility| image:: https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg
-   :target: https://img.shields.io/badge/SIMP%20compatibility-4.2.*%2F5.1.*-orange.svg
+      :target: https://travis-ci.org/simp/pupmod-simp-simp_logstash

spec/acceptance/suites/default/01_client_server_spec.rb

@@ -27,6 +27,9 @@ class { 'rsyslog':
       context "client #{client}-> server #{server} without TLS" do
         it 'should configure client without errors' do
           apply_manifest_on(client, client_manifest, :catch_failures => true)
+
+          # rsyslog is not idempotent on el6
+          apply_manifest_on(client, client_manifest, :catch_failures => true)
         end
 
         it 'should configure client idempotently' do