CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v5.3.1](https://github.com/sensu/sensu-puppet/tree/v5.3.1) (2020-11-05)
+
+[Full Changelog](https://github.com/sensu/sensu-puppet/compare/v5.3.0...v5.3.1)
+
+### Fixed
+
+- Fix agent to use correct API URL for agent entity configs [\#1286](https://github.com/sensu/sensu-puppet/pull/1286) ([treydock](https://github.com/treydock))
+
+### Merged Pull Requests
+
+- \[ci skip\] Style updates to puppet code in README [\#1285](https://github.com/sensu/sensu-puppet/pull/1285) ([ghoneycutt](https://github.com/ghoneycutt))
+
 ## [v5.3.0](https://github.com/sensu/sensu-puppet/tree/v5.3.0) (2020-10-28)
 
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v5.2.1...v5.3.0)
@@ -280,7 +292,6 @@
 
 - Updates to travis-ci [\#1186](https://github.com/sensu/sensu-puppet/pull/1186) ([treydock](https://github.com/treydock))
 - Support PDK [\#1184](https://github.com/sensu/sensu-puppet/pull/1184) ([treydock](https://github.com/treydock))
-- Update default resources to match Sensu Go defaults [\#1181](https://github.com/sensu/sensu-puppet/pull/1181) ([treydock](https://github.com/treydock))
 
 ## [v3.12.0](https://github.com/sensu/sensu-puppet/tree/v3.12.0) (2019-11-25)
 

README.md

@@ -269,7 +269,7 @@ associated to `linux` and `apache-servers` subscriptions.
 The following example will manage the resources necessary to use `sensuctl`.
 
 ```puppet
-class { '::sensu':
+class { 'sensu':
   api_host => 'sensu-backend.example.com',
   password => 'supersecret',
 }
@@ -281,7 +281,7 @@ include sensu::cli
 For Windows the `install_source` parameter must be provided:
 
 ```puppet
-class { '::sensu':
+class { 'sensu':
   api_host => 'sensu-backend.example.com',
   password => 'supersecret',
 }

manifests/agent.pp

@@ -155,13 +155,8 @@
       }
     }
   }
-  # Get first backend listed and use that address for API calls to configure
-  # sensu_agent_entity_config resources
-  $_backend = $config['backend-url'][0]
-  $_backend_without_prefix = $_backend.regsubst('^(ws|wss)://', '')
-  $_backend_host = split($_backend_without_prefix, /:/)[0]
   sensu_agent_entity_setup { 'puppet':
-    url      => "${sensu::api_protocol}://${_backend_host}:${sensu::api_port}",
+    url      => $sensu::api_url,
     username => 'puppet-agent_entity_config',
     password => $sensu::_agent_entity_config_password,
   }

metadata.json

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

spec/classes/backend_datastore_postgresql_spec.rb

@@ -20,7 +20,7 @@ class { 'sensu::backend': }
       it do
         should contain_sensu_postgres_config('postgresql').with({
           :ensure        => 'present',
-          :dsn           => 'postgresql://sensu:changeme@localhost:5432/sensu?sslmode=require',
+          :dsn           => sensitive('postgresql://sensu:changeme@localhost:5432/sensu?sslmode=require'),
           :pool_size     => '20',
           :strict        => 'false',
           :batch_buffer  => '0',
@@ -64,7 +64,7 @@ class { 'sensu::backend': postgresql_sslmode => 'disable' }
         it do
           should contain_sensu_postgres_config('postgresql').with({
             :ensure    => 'present',
-            :dsn       => 'postgresql://sensu:changeme@localhost:5432/sensu?sslmode=disable',
+            :dsn       => sensitive('postgresql://sensu:changeme@localhost:5432/sensu?sslmode=disable'),
             :pool_size => '20',
           })
         end
@@ -267,7 +267,7 @@ class { 'sensu::backend':
         it do
           should contain_sensu_postgres_config('postgresql').with({
            :ensure    => 'absent',
-           :dsn       => 'postgresql://sensu:changeme@localhost:5432/sensu?sslmode=require',
+           :dsn       => sensitive('postgresql://sensu:changeme@localhost:5432/sensu?sslmode=require'),
            :pool_size => '20',
          })
         end