CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v5.5.1](https://github.com/sensu/sensu-puppet/tree/v5.5.1) (2020-12-31)
+
+[Full Changelog](https://github.com/sensu/sensu-puppet/compare/v5.5.0...v5.5.1)
+
+### Fixed
+
+- Fix sensu-backend init to work with non-default etc\_dir [\#1296](https://github.com/sensu/sensu-puppet/pull/1296) ([treydock](https://github.com/treydock))
+
+### Merged Pull Requests
+
+- Vagrant [\#1294](https://github.com/sensu/sensu-puppet/pull/1294) ([ghoneycutt](https://github.com/ghoneycutt))
+
 ## [v5.5.0](https://github.com/sensu/sensu-puppet/tree/v5.5.0) (2020-12-15)
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v5.4.0...v5.5.0)
@@ -86,6 +98,7 @@
 - Remove acceptance test skipping for plugins [\#1272](https://github.com/sensu/sensu-puppet/pull/1272) ([treydock](https://github.com/treydock))
 - Make sensu\_ad\_auth group\_search optional [\#1266](https://github.com/sensu/sensu-puppet/pull/1266) ([treydock](https://github.com/treydock))
 - Add sensu::backend\_upgrade task [\#1265](https://github.com/sensu/sensu-puppet/pull/1265) ([treydock](https://github.com/treydock))
+- Allow disabling namespace validation for large environments [\#1254](https://github.com/sensu/sensu-puppet/pull/1254) ([treydock](https://github.com/treydock))
 
 ## [v4.13.1](https://github.com/sensu/sensu-puppet/tree/v4.13.1) (2020-08-13)
 
@@ -111,10 +124,6 @@
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v4.11.0...v4.12.0)
 
-### Added
-
-- Allow disabling namespace validation for large environments [\#1254](https://github.com/sensu/sensu-puppet/pull/1254) ([treydock](https://github.com/treydock))
-
 ## [v4.11.0](https://github.com/sensu/sensu-puppet/tree/v4.11.0) (2020-06-29)
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v4.10.0...v4.11.0)
@@ -175,6 +184,7 @@
 ### Added
 
 - Ignore builtin sensu.io/managed\_by label [\#1228](https://github.com/sensu/sensu-puppet/pull/1228) ([treydock](https://github.com/treydock))
+- Allow agents to have subscriptions defined as a resource [\#1227](https://github.com/sensu/sensu-puppet/pull/1227) ([treydock](https://github.com/treydock))
 
 ### Merged Pull Requests
 
@@ -188,7 +198,6 @@
 
 ### Added
 
-- Allow agents to have subscriptions defined as a resource [\#1227](https://github.com/sensu/sensu-puppet/pull/1227) ([treydock](https://github.com/treydock))
 - Support bonsai version with v prefix [\#1223](https://github.com/sensu/sensu-puppet/pull/1223) ([treydock](https://github.com/treydock))
 - Manage license through sensu\_license type [\#1218](https://github.com/sensu/sensu-puppet/pull/1218) ([treydock](https://github.com/treydock))
 
@@ -210,7 +219,6 @@
 - Add more examples [\#1214](https://github.com/sensu/sensu-puppet/pull/1214) ([treydock](https://github.com/treydock))
 - Better organization of class variables [\#1213](https://github.com/sensu/sensu-puppet/pull/1213) ([treydock](https://github.com/treydock))
 - Better documentation of private types [\#1212](https://github.com/sensu/sensu-puppet/pull/1212) ([treydock](https://github.com/treydock))
-- Support EL8 [\#1208](https://github.com/sensu/sensu-puppet/pull/1208) ([treydock](https://github.com/treydock))
 
 ### Fixed
 
@@ -227,6 +235,8 @@
 ### Added
 
 - Update puppet-strings examples for composite names [\#1211](https://github.com/sensu/sensu-puppet/pull/1211) ([treydock](https://github.com/treydock))
+- Support EL8 [\#1208](https://github.com/sensu/sensu-puppet/pull/1208) ([treydock](https://github.com/treydock))
+- Add manage\_agent\_user parameter to sensu::backend [\#1206](https://github.com/sensu/sensu-puppet/pull/1206) ([treydock](https://github.com/treydock))
 
 ## [v4.4.1](https://github.com/sensu/sensu-puppet/tree/v4.4.1) (2020-02-01)
 
@@ -240,10 +250,6 @@
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v4.3.0...v4.4.0)
 
-### Added
-
-- Add manage\_agent\_user parameter to sensu::backend [\#1206](https://github.com/sensu/sensu-puppet/pull/1206) ([treydock](https://github.com/treydock))
-
 ## [v4.3.0](https://github.com/sensu/sensu-puppet/tree/v4.3.0) (2020-01-29)
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v4.2.1...v4.3.0)
@@ -287,19 +293,13 @@
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.14.0...v4.0.0)
 
-### Changed
-
-- BREAKING: Add API providers [\#1191](https://github.com/sensu/sensu-puppet/pull/1191) ([treydock](https://github.com/treydock))
-
 ### Added
 
 - Document contact routing and bonsai asset bugfix [\#1194](https://github.com/sensu/sensu-puppet/pull/1194) ([treydock](https://github.com/treydock))
-- Support 'sensu-backend init' added in Sensu Go 5.16 [\#1192](https://github.com/sensu/sensu-puppet/pull/1192) ([treydock](https://github.com/treydock))
 
 ### Merged Pull Requests
 
 - Style [\#1193](https://github.com/sensu/sensu-puppet/pull/1193) ([ghoneycutt](https://github.com/ghoneycutt))
-- \(ci\) Update TravisCI configuration for new Slack channel [\#1190](https://github.com/sensu/sensu-puppet/pull/1190) ([ghoneycutt](https://github.com/ghoneycutt))
 
 ## [v3.14.0](https://github.com/sensu/sensu-puppet/tree/v3.14.0) (2019-12-01)
 

Vagrantfile

@@ -119,15 +119,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     agent.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_agent"
   end
 
-  config.vm.define "el6-agent", autostart: false do |agent|
-    agent.vm.box = "centos/6"
-    agent.vm.hostname = 'el6-agent.example.com'
-    agent.vm.network  :private_network, ip: "192.168.52.12"
-    agent.vm.provision :shell, :path => "tests/provision_basic_el.sh"
-    agent.vm.provision :shell, :inline => "puppet apply /vagrant/tests/sensu-agent.pp"
-    agent.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_agent"
-  end
-
   config.vm.define "ubuntu1804-agent", autostart: false do |agent|
     agent.vm.box = "ubuntu/bionic64"
     agent.vm.hostname = 'ubuntu1804-agent.example.com'
@@ -164,18 +155,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     agent.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_agent"
   end
 
-  config.vm.define "debian8-agent", autostart: false do |agent|
-    agent.vm.box = "debian/jessie64"
-    # TODO: Use specific version as something broken with 8.11.1
-    # See https://github.com/sensu/sensu-puppet/pull/1234#issuecomment-605355385
-    agent.vm.box_version = '8.11.0'
-    agent.vm.hostname = 'debian8-agent.example.com'
-    agent.vm.network  :private_network, ip: "192.168.52.17"
-    agent.vm.provision :shell, :path => "tests/provision_basic_debian.sh"
-    agent.vm.provision :shell, :inline => "puppet apply /vagrant/tests/sensu-agent.pp"
-    agent.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_agent"
-  end
-
   config.vm.define "win2012r2-agent", autostart: false do |agent|
     agent.vm.box = "opentable/win-2012r2-standard-amd64-nocm"
     agent.vm.provider :virtualbox do |vb|

manifests/backend.pp

@@ -376,6 +376,7 @@
 
   exec { 'sensu-backend init':
     path        => '/usr/bin:/bin:/usr/sbin:/sbin',
+    command     => "sensu-backend init --config-file ${sensu::etc_dir}/backend.yml",
     environment => [
       'SENSU_BACKEND_CLUSTER_ADMIN_USERNAME=admin',
       "SENSU_BACKEND_CLUSTER_ADMIN_PASSWORD=${sensu::password}",
@@ -384,7 +385,7 @@
     # sensu-backend init will exit with code 3 if already run
     # If exit code is 3, do not need to run sensu-backend init again
     # If exit is not 3, run sensu-backend init
-    unless      => 'sensu-backend init ; [ $? -eq 3 ] && exit 0 || exit 1',
+    unless      => "sensu-backend init --config-file ${sensu::etc_dir}/backend.yml ; [ \$? -eq 3 ] && exit 0 || exit 1",
     require     => Sensu_api_validator['sensu'],
     before      => [
       Sensu_user['admin'],

metadata.json

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

spec/acceptance/00_backend_spec.rb

@@ -99,6 +99,7 @@ class { 'sensu::backend':
       pp = <<-EOS
       class { '::sensu':
         etc_dir  => '/etc/sensugo',
+        ssl_dir  => '/etc/sensugo/ssl',
         password => 'supersecret',
       }
       class { 'sensu::backend':
@@ -108,6 +109,11 @@ class { 'sensu::backend':
       }
       EOS
 
+      # Cleanup sensu-backend to verify 'sensu-backend init' works with changed etc_dir
+      on node, 'puppet resource service sensu-backend ensure=stopped'
+      on node, 'rm -rf /etc/sensu'
+      on node, 'rm -rf /root/.config'
+      on node, 'rm -rf /var/lib/sensu/sensu-backend/etcd'
       if RSpec.configuration.sensu_use_agent
         site_pp = "node 'sensu-backend' { #{pp} }"
         puppetserver = hosts_as('puppetserver')[0]

spec/classes/backend_spec.rb

@@ -240,12 +240,13 @@
         it {
           should contain_exec('sensu-backend init').with({
             'path'        => '/usr/bin:/bin:/usr/sbin:/sbin',
+            'command'     => 'sensu-backend init --config-file /etc/sensu/backend.yml',
             'environment' => [
               'SENSU_BACKEND_CLUSTER_ADMIN_USERNAME=admin',
               'SENSU_BACKEND_CLUSTER_ADMIN_PASSWORD=P@ssw0rd!',
             ],
             'returns'     => [0, 3],
-            'unless'      => 'sensu-backend init ; [ $? -eq 3 ] && exit 0 || exit 1',
+            'unless'      => 'sensu-backend init --config-file /etc/sensu/backend.yml ; [ $? -eq 3 ] && exit 0 || exit 1',
             'require'     => 'Sensu_api_validator[sensu]',
             'before'      => [
               'Sensu_user[admin]',