[542] Add dependencies for sensu_gem plugins #817
Conversation
Previously, on upgrades to Sensu that installed a new embedded Ruby installation, there was a chance that plugins installed with the `sensu_gem` package provider would be evaluated BEFORE the Sensu package was upgraded (which would mean that a second run of Puppet was necessary to get the plugins installed into the new embedded Ruby installation). This commit adds a resource chain ensuring that a change to the Sensu package will come before any package resources using the `sensu_gem` provider (which would in turn notify the Sensu services of their change).
glarizza
changed the title
|
Tied to #542 |
manifests/init.pp
Outdated
| # necessary to get the plugins installed into the new embedded Ruby folder. | ||
| Package['sensu'] | ||
| ~> Package<| provider == 'sensu_gem' |> | ||
| ~> Service['sensu-client', 'sensu-server', 'sensu-api'] |
There was a problem hiding this comment.
Please test with the enterprise version as it uses different service names, we would need to take that into account.
There was a problem hiding this comment.
Good call, I'll test and most likely will ultimately add sensu-enterprise to the service list. I think we're fine with only needing Package['sensu'] because I think the Sensu core package is the one that installs the embedded Ruby (not sure what Package['sensu-enterprise'] adds, but as long as it's something other than the Ruby implementation I don't care about it).
This commit adds a script that will allow you to replicate and check for the problem where plugins may get installed before a sensu package change. Note that I have hardcoded version '0.23.0' as an 'older' version of Sensu because I know it uses a different Ruby MRI than Latest. This may need adjusted later.
|
Tests are failing on some rspec-puppet tests because of the last line: Package['sensu'] ~>
Package<| provider == 'sensu_gem' |> ~>
Service['sensu-client', 'sensu-server', 'sensu-api']On cases where the api or client hasn't been installed there won't be any resources for the sensu-api or sensu-client service. In its place I can do something like this: ~> Service<| title == 'sensu-client' or title == 'sensu-server' or title == 'sensu-api'|>That collector will discover the resources if they're there and setup the dependencies, or exit silently if they're not in the catalog. It's not the prettiest, but it will do. |
manifests/init.pp
Outdated
| Package['sensu'] | ||
| ~> Package<| provider == 'sensu_gem' |> | ||
| ~> Service<| title == 'sensu-client' or title == 'sensu-server' or title == 'sensu-api'|> | ||
| #~> Service['sensu-client', 'sensu-server', 'sensu-api'] |
There was a problem hiding this comment.
Still working through the enterprise side?
These will need the corresponding spec tests.
There was a problem hiding this comment.
I need to pull out that comment for sure. As for the enterprise side, I'm waiting for @agoddard to reply to what services (if any) on the enterprise we will need to bump (see: #542 (comment)). I don't think we need to bounce that service, but I'll add it when I get a reply
Tests were failing because of this stanza (and specifically the last line): ```puppet Package['sensu'] ~> Package<| provider == 'sensu_gem' |> ~> Service['sensu-client', 'sensu-server', 'sensu-api'] ``` On cases where the api or client hasn't been installed there won't be any resources for the sensu-api or sensu-client service. In its place is this line: ```puppet ~> Service<| title == 'sensu-client' or title == 'sensu-server' or title == 'sensu-api'|> ``` That collector will discover the resources if they're there and setup the dependencies, or exit silently if they're not in the catalog. It's not the prettiest, but it will do.
glarizza
force-pushed
the
542_sensu_gem_dependencies
branch
from
ba63dbd to
b1be918
Compare
|
ping @agoddard |
|
@ghoneycutt I think I'm missing the outstanding question here. Are we trying to determine how to handle the case where no Sensu service resources are defined? |
|
Fixes #542 |
|
Released in v2.46.0 |
Previously, on upgrades to Sensu that installed a new embedded Ruby
installation, there was a chance that plugins installed with the
sensu_gempackage provider would be evaluated BEFORE the Sensu package was upgraded
(which would mean that a second run of Puppet was necessary to get the plugins
installed into the new embedded Ruby installation). This commit adds a resource
chain ensuring that a change to the Sensu package will come before any package
resources using the
sensu_gemprovider (which would in turn notify the Sensuservices of their change).