CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
-## [v3.5.0](https://github.com/sensu/sensu-puppet/tree/v3.5.0) (2019-07-21)
+## [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)
+
+**Merged pull requests:**
+
+- Better support for resources in different namespaces [\#1126](https://github.com/sensu/sensu-puppet/pull/1126) ([treydock](https://github.com/treydock))
+
+## [v3.5.0](https://github.com/sensu/sensu-puppet/tree/v3.5.0) (2019-07-22)
 [Full Changelog](https://github.com/sensu/sensu-puppet/compare/v3.4.1...v3.5.0)
 
 **Merged pull requests:**

README.md

@@ -22,6 +22,7 @@
     * [Sensu backend cluster](#sensu-backend-cluster)
         * [Adding backend members to an existing cluster](#adding-backend-members-to-an-existing-cluster)
     * [Large Environment Considerations](#large-environment-considerations)
+    * [Composite Names for Namespaces](#composite-names-for-namespaces)
 4. [Reference](#reference)
     * [Facts](#facts)
 5. [Limitations - OS compatibility, etc.](#limitations)
@@ -482,6 +483,35 @@ class { '::sensu::backend':
 }
 ```
 
+### Composite Names for Namespaces
+
+All resources that support having a `namespace` also support a composite name to define the namespace.
+
+For example, the `sensu_check` with name `check-cpu in team1` would be named `check-cpu` and put into the `team1` namespace.
+
+Using composite names is necessary if you wish to have multiple resources with the same name but in different namespaces.
+
+For example to define the same check in two namespaces using the same check name:
+
+```puppet
+sensu_check { 'check-cpu in default':
+  ensure        => 'present',
+  command       => 'check-cpu.sh -w 75 -c 90',
+  interval      => 60,
+  subscriptions => ['linux'],
+}
+sensu_check { 'check-cpu in team1':
+  ensure        => 'present',
+  command       => 'check-cpu.sh -w 75 -c 90',
+  interval      => 60,
+  subscriptions => ['linux'],
+}
+```
+
+The example above would add the `check-cpu` check to both the `default` and `team1` namespaces.
+
+**NOTE:** If you use composite names for namespaces, the `namespace` property takes precedence.
+
 ## Reference
 
 ### Facts

REFERENCE.md

@@ -905,6 +905,17 @@ sensu_asset { 'test':
 }
 ```
 
+##### Create an asset with namespace `dev` in the name
+
+```puppet
+sensu_asset { 'test in dev':
+  ensure  => 'present',
+  url     => 'http://example.com/asset/example.tar',
+  sha512  => '4f926bf4328fbad2b9cac873d117f771914f4b837c9c85584c38ccf55a3ef3c2e8d154812246e5dda4a87450576b2c58ad9ab40c9e2edc31b288d066b195b21b',
+  filters  => ["entity.system.os == 'linux'"],
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_asset` type.
@@ -957,6 +968,12 @@ The following parameters are available in the `sensu_asset` type.
 
 namevar
 
+The name of the asset.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the asset.
 
 ### sensu_check
@@ -1000,6 +1017,18 @@ sensu_check { 'test':
 }
 ```
 
+##### Create a check with namespace `dev` in the name
+
+```puppet
+sensu_check { 'test in dev':
+  ensure        => 'present',
+  command       => 'check-http.rb',
+  subscriptions => ['demo'],
+  handlers      => ['email'],
+  interval      => 60,
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_check` type.
@@ -1168,6 +1197,12 @@ The following parameters are available in the `sensu_check` type.
 
 namevar
 
+The name of the check.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the check.
 
 ### sensu_cluster_member
@@ -1437,6 +1472,15 @@ sensu_entity { 'test':
 }
 ```
 
+##### Create an entity with namespace `dev` in the name
+
+```puppet
+sensu_entity { 'test in dev':
+  ensure       => 'present',
+  entity_class => 'proxy',
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_entity` type.
@@ -1503,7 +1547,13 @@ The following parameters are available in the `sensu_entity` type.
 
 namevar
 
-The unique name of the entity
+The name of the entity.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
+The name of the entity.
 
 ### sensu_event
 
@@ -1590,6 +1640,16 @@ sensu_filter { 'test':
 }
 ```
 
+##### Create a filter with namespace `dev` in the name
+
+```puppet
+sensu_filter { 'test in dev':
+  ensure      => 'present',
+  action      => 'allow',
+  expressions => ["event.entity.labels.environment == 'production'"],
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_filter` type.
@@ -1640,6 +1700,12 @@ The following parameters are available in the `sensu_filter` type.
 
 namevar
 
+The name of the filter.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the filter.
 
 ### sensu_handler
@@ -1667,6 +1733,16 @@ sensu_handler { 'test':
 }
 ```
 
+##### Create a handler with namespace `dev` in the name
+
+```puppet
+sensu_handler { 'test in dev':
+  ensure  => 'present',
+  type    => 'pipe',
+  command => 'notify.rb'
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_handler` type.
@@ -1757,6 +1833,12 @@ The following parameters are available in the `sensu_handler` type.
 
 namevar
 
+The name of the handler.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the handler.
 
 ### sensu_hook
@@ -1779,6 +1861,15 @@ sensu_hook { 'test':
 }
 ```
 
+##### Create a hook with namespace `dev` in the name
+
+```puppet
+sensu_hook { 'test in dev':
+  ensure  => 'present',
+  command => 'ps aux',
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_hook` type.
@@ -1831,6 +1922,12 @@ The following parameters are available in the `sensu_hook` type.
 
 namevar
 
+The name of the hook.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the hook.
 
 ### sensu_ldap_auth
@@ -1960,6 +2057,15 @@ sensu_mutator { 'example':
 }
 ```
 
+##### Create a mutator with namespace `dev` in the name
+
+```puppet
+sensu_mutator { 'example in dev':
+  ensure  => 'present',
+  command => 'example-mutator.rb',
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_mutator` type.
@@ -2016,6 +2122,12 @@ The following parameters are available in the `sensu_mutator` type.
 
 namevar
 
+The name of the mutator.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the mutator.
 
 ### sensu_namespace
@@ -2163,6 +2275,15 @@ sensu_role { 'test':
 }
 ```
 
+##### Add a role with namespace `dev` in the name
+
+```puppet
+sensu_role { 'test in dev':
+  ensure => 'present',
+  rules  => [{'verbs' => ['get','list'], 'resources' => ['checks'], 'resource_names' => ['']}],
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_role` type.
@@ -2193,6 +2314,12 @@ The following parameters are available in the `sensu_role` type.
 
 namevar
 
+The name of the role.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the role.
 
 ### sensu_role_binding
@@ -2220,6 +2347,18 @@ sensu_role_binding { 'test':
 }
 ```
 
+##### Add a role binding with namespace `dev` in the name
+
+```puppet
+sensu_role_binding { 'test in dev':
+  ensure   => 'present',
+  role_ref => 'test-role',
+  subjects => [
+    { 'type' => 'User', 'name' => 'test-user' }
+  ],
+}
+```
+
 #### Properties
 
 The following properties are available in the `sensu_role_binding` type.
@@ -2254,6 +2393,12 @@ The following parameters are available in the `sensu_role_binding` type.
 
 namevar
 
+The name of the binding.
+The name supports composite names that can define the namespace.
+An example composite name to define resource named `test` in namespace `dev`: `test in dev`
+
+##### `resource_name`
+
 The name of the role binding.
 
 ### sensu_silenced

lib/puppet/provider/sensu_asset/sensuctl.rb

@@ -13,8 +13,9 @@ def self.instances
     data.each do |d|
       asset = {}
       asset[:ensure] = :present
-      asset[:name] = d['metadata']['name']
+      asset[:resource_name] = d['metadata']['name']
       asset[:namespace] = d['metadata']['namespace']
+      asset[:name] = "#{asset[:resource_name]} in #{asset[:namespace]}"
       asset[:labels] = d['metadata']['labels']
       asset[:annotations] = d['metadata']['annotations']
       d.each_pair do |key, value|
@@ -34,7 +35,7 @@ def self.instances
   def self.prefetch(resources)
     assets = instances
     resources.keys.each do |name|
-      if provider = assets.find { |c| c.name == name }
+      if provider = assets.find { |c| c.resource_name == resources[name][:resource_name] && c.namespace == resources[name][:namespace] }
         resources[name].provider = provider
       end
     end
@@ -58,7 +59,7 @@ def initialize(value = {})
   def create
     spec = {}
     metadata = {}
-    metadata[:name] = resource[:name]
+    metadata[:name] = resource[:resource_name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
@@ -88,7 +89,7 @@ def flush
     if !@property_flush.empty?
       spec = {}
       metadata = {}
-      metadata[:name] = resource[:name]
+      metadata[:name] = resource[:resource_name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -122,7 +123,7 @@ def flush
 
   def destroy
     begin
-      sensuctl_delete('asset', resource[:name])
+      sensuctl_delete('asset', resource[:resource_name], resource[:namespace])
     rescue Exception => e
       raise Puppet::Error, "sensuctl delete asset #{resource[:name]} failed\nError message: #{e.message}"
     end