.fixtures-latest.yml

@@ -7,6 +7,15 @@ fixtures:
     yumrepo_core:
       repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
       puppet_version: ">= 6.0.0"
+    # Need by postgresql
+    augeas_core:
+      repo: git://github.com/puppetlabs/puppetlabs-augeas_core
+      puppet_version: ">= 6.0.0"
+    # Need by postgresql
+    concat:
+      repo: git://github.com/puppetlabs/puppetlabs-concat.git
+    postgresql:
+      repo: git://github.com/puppetlabs/puppetlabs-postgresql.git
     archive:
       repo: git://github.com/voxpupuli/puppet-archive.git
   symlinks:

.fixtures.yml

@@ -10,6 +10,18 @@ fixtures:
       repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
       ref: 1.0.1
       puppet_version: ">= 6.0.0"
+    # Need by postgresql
+    augeas_core:
+      repo: git://github.com/puppetlabs/puppetlabs-augeas_core
+      ref: 1.0.4
+      puppet_version: ">= 6.0.0"
+    # Need by postgresql
+    concat:
+      repo: git://github.com/puppetlabs/puppetlabs-concat.git
+      ref: v6.0.0
+    postgresql:
+      repo: git://github.com/puppetlabs/puppetlabs-postgresql.git
+      ref: v6.0.0
     archive:
       repo: git://github.com/voxpupuli/puppet-archive.git
       ref: 'v3.0.0'

.travis.yml

@@ -124,6 +124,18 @@ matrix:
     env: BEAKER_set="debian-9" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_ci_build=yes
     bundler_args:
     script: bundle exec rake beaker
+  - rvm: 2.5.3
+    sudo: required
+    services: docker
+    env: BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet6
+    bundler_args:
+    script: bundle exec rake beaker
+  - rvm: 2.5.3
+    sudo: required
+    services: docker
+    env: BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_ci_build=yes
+    bundler_args:
+    script: bundle exec rake beaker
   - rvm: 2.4.4
     sudo: required
     services: docker
@@ -227,6 +239,8 @@ matrix:
     env: BEAKER_set="centos-7-cluster" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_cluster=yes BEAKER_sensu_ci_build=yes
   - rvm: 2.5.3
     env: BEAKER_set="debian-9" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_ci_build=yes
+  - rvm: 2.5.3
+    env: BEAKER_set="debian-10" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_ci_build=yes
   - rvm: 2.5.3
     env: BEAKER_set="ubuntu-1604" BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_sensu_ci_build=yes
   - rvm: 2.5.3

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v3.7.0](https://github.com/sensu/sensu-puppet/tree/v3.7.0) (2019-08-25)
+[Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.6.0...v3.7.0)
+
+**Merged pull requests:**
+
+- Support PostgreSQL datastore [\#1136](https://github.com/sensu/sensu-puppet/pull/1136) ([treydock](https://github.com/treydock))
+- Increase upper bound of module dependencies [\#1134](https://github.com/sensu/sensu-puppet/pull/1134) ([treydock](https://github.com/treydock))
+- Improved Validations [\#1132](https://github.com/sensu/sensu-puppet/pull/1132) ([treydock](https://github.com/treydock))
+- Do not resolve absent sensu\_events [\#1129](https://github.com/sensu/sensu-puppet/pull/1129) ([treydock](https://github.com/treydock))
+- Support Debian 10 [\#1128](https://github.com/sensu/sensu-puppet/pull/1128) ([treydock](https://github.com/treydock))
+
 ## [v3.6.0](https://github.com/sensu/sensu-puppet/tree/v3.6.0) (2019-08-16)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.5.0...v3.6.0)
 

README.md

@@ -14,6 +14,7 @@
     * [Advanced agent](#advanced-agent)
     * [Advanced SSL](#advanced-ssl)
     * [Enterprise support](#enterprise-support)
+    * [PostgreSQL datastore support](#postgresql-datastore-support)
     * [Installing Plugins](#installing-plugins)
     * [Installing Extensions](#installing-extensions)
     * [Exported resources](#exported-resources)
@@ -64,11 +65,13 @@ This module will install packages, create configuration and start services neces
 
 Plugin sync is required if the custom sensu types and providers are used.
 
-This module has a soft dependency on the [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) module (`>= 5.0.1 < 7.0.0`) for systems using `apt`.
+This module has a soft dependency on the [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) module (`>= 5.0.1 < 8.0.0`) for systems using `apt`.
 
 If using Puppet >= 6.0.0 there is a soft dependency on the [puppetlabs/yumrepo_core](https://forge.puppet.com/puppetlabs/yumrepo_core) module (`>= 1.0.1 < 2.0.0`) for systems using `yum`.
 
-If managing Windows there is a soft dependency on the [puppet/archive](https://forge.puppet.com/puppet/archive) module (`>= 3.0.0 < 4.0.0`).
+If managing Windows there is a soft dependency on the [puppet/archive](https://forge.puppet.com/puppet/archive) module (`>= 3.0.0 < 5.0.0`).
+
+For PostgreSQL datastore support there is a soft dependency on [puppetlabs/postgresql](https://forge.puppet.com/puppetlabs/postgresql) module (`>= 6.0.0 < 7.0.0`).
 
 ### Beginning with sensu
 
@@ -219,7 +222,40 @@ class { 'sensu::backend':
 }
 ```
 
-The type `sensu_ldap_auth` requires a valid enterprise license.
+The types `sensu_ad_auth` and `sensu_ldap_auth` require a valid enterprise license.
+
+### PostgreSQL datastore support
+
+**NOTE**: This features require a valid Sensu Go enterprise license.
+
+The following example will add a PostgreSQL server and database to the sensu-backend host and configure Sensu Go to use PostgreSQL as the event datastore.
+
+```puppet
+class { 'postgresql::globals':
+  manage_package_repo => true,
+  version             => '9.6',
+}
+class { 'postgresql::server': }
+class { '::sensu::backend':
+  license_source      => 'puppet:///modules/profile/sensu/license.json',
+  datastore           => 'postgresql',
+  postgresql_password => 'secret',
+}
+```
+
+Refer to the [puppetlabs/postgresql](https://forge.puppet.com/puppetlabs/postgresql) module documentation for details on how to manage PostgreSQL with Puppet.
+
+The following example uses an external PostgreSQL server.
+
+```puppet
+class { '::sensu::backend':
+  license_source       => 'puppet:///modules/profile/sensu/license.json',
+  datastore            => 'postgresql',
+  postgresql_password  => 'secret',
+  postgresql_host      => 'postgresql.example.com',
+  manage_postgresql_db => false,
+}
+```
 
 ### Installing Plugins
 
@@ -588,6 +624,7 @@ Linux.
 * EL 7
 * Debian 8
 * Debian 9
+* Debian 10 (Puppet 6 only)
 * Ubuntu 16.04 LTS
 * Ubuntu 18.04 LTS
 * Amazon 2018.03

REFERENCE.md

@@ -10,6 +10,7 @@ _Public Classes_
 * [`sensu`](#sensu): Base Sensu class
 * [`sensu::agent`](#sensuagent): Manage Sensu agent
 * [`sensu::backend`](#sensubackend): Manage Sensu backend
+* [`sensu::backend::datastore::postgresql`](#sensubackenddatastorepostgresql): 
 * [`sensu::plugins`](#sensuplugins): Manage Sensu plugins
 
 _Private Classes_
@@ -620,6 +621,91 @@ Chunk size to use when listing sensuctl resources
 
 Default value: `undef`
 
+##### `datastore`
+
+Data type: `Optional[Enum['postgresql']]`
+
+Datastore to configure for sensu events
+
+Default value: `undef`
+
+##### `datastore_ensure`
+
+Data type: `Enum['present','absent']`
+
+The datastore ensure property. If set to `absent` all
+datastore parameters must still be defined.
+
+Default value: 'present'
+
+##### `manage_postgresql_db`
+
+Data type: `Boolean`
+
+Boolean that sets of postgresql database should be managed
+
+Default value: `true`
+
+##### `postgresql_name`
+
+Data type: `String`
+
+Name of PostgresConfig that is configured with sensuctl
+
+Default value: 'postgresql'
+
+##### `postgresql_user`
+
+Data type: `String`
+
+The PostgreSQL database user
+
+Default value: 'sensu'
+
+##### `postgresql_password`
+
+Data type: `String`
+
+The PostgreSQL database password
+
+Default value: 'changeme'
+
+##### `postgresql_host`
+
+Data type: `Stdlib::Host`
+
+The PostgreSQL host
+
+Default value: 'localhost'
+
+##### `postgresql_port`
+
+Data type: `Stdlib::Port`
+
+The PostgreSQL port
+
+Default value: 5432
+
+##### `postgresql_dbname`
+
+Data type: `String`
+
+The name of the PostgreSQL database
+
+Default value: 'sensu'
+
+##### `postgresql_pool_size`
+
+Data type: `Integer`
+
+The PostgreSQL pool size
+
+Default value: 20
+
+### sensu::backend::datastore::postgresql
+
+The sensu::backend::datastore::postgresql class.
+
 ### sensu::plugins
 
 Class to manage the Sensu plugins.

Vagrantfile

@@ -109,6 +109,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     agent.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_agent"
   end
 
+  config.vm.define "debian10-agent", autostart: false do |agent|
+    agent.vm.box = "debian/buster64"
+    agent.vm.hostname = 'debian10-agent.example.com'
+    agent.vm.network  :private_network, ip: "192.168.52.27"
+    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 "debian9-agent", autostart: false do |agent|
     agent.vm.box = "debian/stretch64"
     agent.vm.hostname = 'debian9-agent.example.com'

lib/puppet/provider/sensuctl.rb

@@ -116,5 +116,21 @@ def self.sensuctl_auth_types()
     Puppet.debug("auth_types: #{auth_types}")
     auth_types
   end
+
+  def self.namespaces()
+    begin
+      data = self.sensuctl_list('namespace', false)
+      namespaces = []
+      data.each do |d|
+        namespaces << d['name']
+      end
+    rescue Exception
+      return []
+    end
+    namespaces
+  end
+  def namespaces()
+    self.class.namespaces()
+  end
 end
 

lib/puppet/type/sensu_asset.rb

@@ -122,5 +122,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_check.rb

@@ -298,5 +298,6 @@ def pre_run_check
         end
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_entity.rb

@@ -138,6 +138,7 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end
 

lib/puppet/type/sensu_event.rb

@@ -42,6 +42,22 @@
     def retrieve
       @resource.provider.state || :absent 
     end
+
+    def insync?(is)
+      if is.is_a?(Array)
+        is = is[0]
+      end
+      if @should.is_a?(Array)
+        should = @should[0]
+      else
+        should = @should
+      end
+      if is.to_sym == :absent && should.to_sym == :resolve
+        true
+      else
+        super
+      end
+    end
   end
 
   newparam(:name, :namevar => true) do
@@ -86,5 +102,8 @@ def self.title_patterns
     end
   end
 
+  def pre_run_check
+    PuppetX::Sensu::Type.validate_namespace(self)
+  end
 end
 

lib/puppet/type/sensu_filter.rb

@@ -114,5 +114,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_handler.rb

@@ -185,5 +185,6 @@ def pre_run_check
     if self[:type] == :set && !self[:handlers]
       fail "handlers must be defined for type set"
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_hook.rb

@@ -107,5 +107,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_mutator.rb

@@ -116,5 +116,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_role.rb

@@ -117,5 +117,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_role_binding.rb

@@ -151,5 +151,6 @@ def pre_run_check
         fail "You must provide a #{property}"
       end
     end
+    PuppetX::Sensu::Type.validate_namespace(self)
   end
 end

lib/puppet/type/sensu_silenced.rb

@@ -138,5 +138,8 @@ def self.title_patterns
     end
   end
 
+  def pre_run_check
+    PuppetX::Sensu::Type.validate_namespace(self)
+  end
 end