.travis.yml

@@ -64,6 +64,18 @@ matrix:
     env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_full=yes BEAKER_sensu_ci_build=yes
     bundler_args:
     script: bundle exec rake beaker
+  - rvm: 2.4.4
+    sudo: required
+    services: docker
+    env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_full=yes BEAKER_sensu_use_agent=yes
+    bundler_args:
+    script: bundle exec rake beaker
+  - rvm: 2.5.3
+    sudo: required
+    services: docker
+    env: BEAKER_set="centos-7" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_full=yes BEAKER_sensu_use_agent=yes
+    bundler_args:
+    script: bundle exec rake beaker
   - rvm: 2.4.4
     sudo: required
     services: docker
@@ -76,6 +88,18 @@ matrix:
     env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes
     bundler_args:
     script: bundle exec rake beaker
+  - rvm: 2.4.4
+    sudo: required
+    services: docker
+    env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_sensu_cluster=yes BEAKER_sensu_use_agent=yes
+    bundler_args:
+    script: bundle exec rake beaker
+  - rvm: 2.5.3
+    sudo: required
+    services: docker
+    env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes BEAKER_sensu_use_agent=yes
+    bundler_args:
+    script: bundle exec rake beaker
   - rvm: 2.5.3
     sudo: required
     services: docker

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v3.4.1](https://github.com/sensu/sensu-puppet/tree/v3.4.1) (2019-07-19)
+[Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.4.0...v3.4.1)
+
+**Merged pull requests:**
+
+- Add acceptance tests that use puppetserver [\#1123](https://github.com/sensu/sensu-puppet/pull/1123) ([treydock](https://github.com/treydock))
+- Fix to support Puppetserver 5 [\#1122](https://github.com/sensu/sensu-puppet/pull/1122) ([treydock](https://github.com/treydock))
+
 ## [v3.4.0](https://github.com/sensu/sensu-puppet/tree/v3.4.0) (2019-07-11)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.3.0...v3.4.0)
 
@@ -10,6 +18,7 @@
 - Add ability to run acceptance tests against Sensu-Go CI builds [\#1115](https://github.com/sensu/sensu-puppet/pull/1115) ([treydock](https://github.com/treydock))
 - Support listing sensuctl resources using chunk-size [\#1114](https://github.com/sensu/sensu-puppet/pull/1114) ([treydock](https://github.com/treydock))
 - Regenerate backend test cert to include additional SANs [\#1113](https://github.com/sensu/sensu-puppet/pull/1113) ([treydock](https://github.com/treydock))
+- Support Sensu Go 5.6 [\#1105](https://github.com/sensu/sensu-puppet/pull/1105) ([treydock](https://github.com/treydock))
 
 ## [v3.3.0](https://github.com/sensu/sensu-puppet/tree/v3.3.0) (2019-05-18)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.2.0...v3.3.0)
@@ -24,10 +33,6 @@
 ## [v3.2.0](https://github.com/sensu/sensu-puppet/tree/v3.2.0) (2019-05-06)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.1.0...v3.2.0)
 
-**Merged pull requests:**
-
-- Support Sensu Go 5.6 [\#1105](https://github.com/sensu/sensu-puppet/pull/1105) ([treydock](https://github.com/treydock))
-
 ## [v3.1.0](https://github.com/sensu/sensu-puppet/tree/v3.1.0) (2019-04-19)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.0.0...v3.1.0)
 

REFERENCE.md

@@ -47,6 +47,10 @@ _Private Classes_
 * [`sensu_user`](#sensu_user): Manages Sensu users
 * [`sensuctl_config`](#sensuctl_config): Abstract type to configure other types
 
+**Data types**
+
+* [`Sensu::Backend_URL`](#sensubackend_url): Sensu Backend URL's require protocol of ws:// or wss://. A port is also required. There is logic in sensu::agent class to add the protocol so
+
 ## Classes
 
 ### sensu
@@ -2480,3 +2484,13 @@ The name of the resource.
 
 sensuctl chunk-size
 
+## Data types
+
+### Sensu::Backend_URL
+
+Sensu Backend URL's require protocol of ws:// or wss://.
+A port is also required.
+There is logic in sensu::agent class to add the protocol so it's optional.
+
+Alias of `Variant[Pattern[/^[^\s:]+:\d+$/], Pattern[/^ws:\/\/[^\s:]+:\d+$/], Pattern[/^wss:\/\/[^\s:]++:\d+$/]]`
+

lib/puppet/provider/sensuctl.rb

@@ -99,28 +99,6 @@ def sensuctl_delete(*args)
     self.class.sensuctl_delete(*args)
   end
 
-  def self.sensuctl_set(command, name, property, value: nil, flags:  nil)
-    args = [command]
-    args << "set-" + property.gsub('_', '-')
-    args << name
-    args << value unless value.nil?
-    args += flags unless flags.nil?
-    sensuctl(args)
-  end
-  def sensuctl_set(*args)
-    self.class.sensuctl_set(*args)
-  end
-
-  def self.sensuctl_remove(command, name, property)
-    args = [command]
-    args << "remove-" + property.gsub('_', '-')
-    args << name
-    sensuctl(args)
-  end
-  def sensuctl_remove(*args)
-    self.class.sensuctl_remove(*args)
-  end
-
   def self.sensuctl_auth_types()
     output = sensuctl(['auth','list','--format','yaml'])
     Puppet.debug("YAML auth list: #{output}")

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "sensu-sensu",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "author": "sensu",
   "summary": "A module to install the Sensu monitoring framework",
   "license": "MIT",

spec/acceptance/00_backend_spec.rb

@@ -12,9 +12,17 @@ class { '::sensu::backend':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(node, pp, :catch_failures => true)
-      apply_manifest_on(node, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(node, pp, :catch_failures => true)
+        apply_manifest_on(node, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => node do
@@ -39,9 +47,17 @@ class { '::sensu::agent':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(node, pp, :catch_failures => true)
-      apply_manifest_on(node, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(node, pp, :catch_failures => true)
+        apply_manifest_on(node, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => node do
@@ -64,9 +80,17 @@ class { '::sensu::backend':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(node, pp, :catch_failures => true)
-      apply_manifest_on(node, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(node, pp, :catch_failures => true)
+        apply_manifest_on(node, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => node do

spec/acceptance/01_agent_spec.rb

@@ -14,9 +14,17 @@ class { '::sensu::agent':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(node, pp, :catch_failures => true)
-      apply_manifest_on(node, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_agent' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(node, pp, :catch_failures => true)
+        apply_manifest_on(node, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-agent'), :node => node do

spec/acceptance/02_backend_cluster_spec.rb

@@ -35,16 +35,29 @@ class { '::sensu::backend':
       }
       EOS
 
-      # First run will fail to run sensuctl configure
-      apply_manifest_on(node1, node1_pp, :acceptable_exit_codes => [0,1])
-      #on node1, 'curl http://127.0.0.1:8080/info', :accept_all_exit_codes => true
-      apply_manifest_on(node2, node2_pp, :catch_failures => true)
-      # first node has to have agent started back up
-      #on node1, 'systemctl status sensu-agent -l', :accept_all_exit_codes => true
-      #on node1, 'curl http://127.0.0.1:8080/info', :accept_all_exit_codes => true
-      apply_manifest_on(node1, node1_pp, :catch_failures => true)
-      apply_manifest_on(node1, node1_pp, :catch_changes  => true)
-      apply_manifest_on(node2, node2_pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = <<-EOS
+        node 'sensu_backend1' { #{node1_pp} }
+        node 'sensu_backend2' { #{node2_pp} }
+        EOS
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        # First run will fail to run sensuctl configure
+        on node1, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,1]
+        on node2, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        # first node has to have agent started back up
+        on node1, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node1, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+        on node2, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # First run will fail to run sensuctl configure
+        apply_manifest_on(node1, node1_pp, :acceptable_exit_codes => [0,1])
+        apply_manifest_on(node2, node2_pp, :catch_failures => true)
+        # first node has to have agent started back up
+        apply_manifest_on(node1, node1_pp, :catch_failures => true)
+        apply_manifest_on(node1, node1_pp, :catch_changes  => true)
+        apply_manifest_on(node2, node2_pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => node1 do
@@ -93,10 +106,23 @@ class { '::sensu::backend':
       }
       EOS
 
-      apply_manifest_on(node1, pp, :catch_failures => true)
-      apply_manifest_on(node3, node3_pp, :catch_failures => true)
-      apply_manifest_on(node1, pp, :catch_changes  => true)
-      apply_manifest_on(node3, node3_pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = <<-EOS
+        node 'sensu_backend1' { #{pp} }
+        node 'sensu_backend3' { #{node3_pp} }
+        EOS
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node1, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node3, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node1, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+        on node3, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        apply_manifest_on(node1, pp, :catch_failures => true)
+        apply_manifest_on(node3, node3_pp, :catch_failures => true)
+        apply_manifest_on(node1, pp, :catch_changes  => true)
+        apply_manifest_on(node3, node3_pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => node3 do

spec/acceptance/03_no_ssl_spec.rb

@@ -20,8 +20,17 @@ class { '::sensu::backend':
 
       # Ensure agent entity doesn't get re-added
       on agent, 'puppet resource service sensu-agent ensure=stopped'
-      apply_manifest_on(backend, pp, :catch_failures => true)
-      apply_manifest_on(backend, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on backend, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on backend, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(backend, pp, :catch_failures => true)
+        apply_manifest_on(backend, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-backend'), :node => backend do
@@ -48,9 +57,17 @@ class { '::sensu::agent':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(agent, pp, :catch_failures => true)
-      apply_manifest_on(agent, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_agent' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on agent, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on agent, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(agent, pp, :catch_failures => true)
+        apply_manifest_on(agent, pp, :catch_changes  => true)
+      end
     end
 
     describe service('sensu-agent'), :node => agent do

spec/acceptance/04_plugins_spec.rb

@@ -24,9 +24,17 @@ class { '::sensu::plugins':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(agent, pp, :catch_failures => true)
-      apply_manifest_on(agent, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_agent' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on agent, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on agent, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(agent, pp, :catch_failures => true)
+        apply_manifest_on(agent, pp, :catch_changes  => true)
+      end
     end
 
     describe package('sensu-plugins-ruby'), :node => agent do
@@ -59,9 +67,17 @@ class { '::sensu::plugins':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(backend, pp, :catch_failures => true)
-      apply_manifest_on(backend, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on backend, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on backend, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(backend, pp, :catch_failures => true)
+        apply_manifest_on(backend, pp, :catch_changes  => true)
+      end
     end
 
     describe package('sensu-plugins-ruby'), :node => backend do

spec/acceptance/05_enterprise_spec.rb

@@ -15,9 +15,17 @@ class { '::sensu::backend':
       }
       EOS
 
-      # Run it twice and test for idempotency
-      apply_manifest_on(node, pp, :catch_failures => true)
-      apply_manifest_on(node, pp, :catch_changes  => true)
+      if RSpec.configuration.sensu_use_agent
+        site_pp = "node 'sensu_backend' { #{pp} }"
+        puppetserver = hosts_as('puppetserver')[0]
+        create_remote_file(puppetserver, "/etc/puppetlabs/code/environments/production/manifests/site.pp", site_pp)
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0,2]
+        on node, puppet("agent -t --detailed-exitcodes"), acceptable_exit_codes: [0]
+      else
+        # Run it twice and test for idempotency
+        apply_manifest_on(node, pp, :catch_failures => true)
+        apply_manifest_on(node, pp, :catch_changes  => true)
+      end
     end
 
     describe command('sensuctl license info'), :node => node do