[WIP] Sensu Enterprise & Enterprise Dashboard support #400
Conversation
| fail("Use of private class ${name} by ${caller_module_name}") | ||
| } | ||
|
|
||
| if $sensu::purge_config and !$sensu::enterprise_dashboard { |
There was a problem hiding this comment.
Likely #401 will end up being merged which changes the purge options (just a heads up)
There was a problem hiding this comment.
p. sure i just rebased against this PR, will update accordingly
|
This is great - thanks for your work! I'd been wondering how easy it would be to support enterprise with this, but not being an enterprise customer I hadn't looked into it at all. I made some comments in the code with thoughts I had as I read over it and would love to see some more testing to go down all of the code paths/options with the changes. |
dhgwilliam
force-pushed
the
sensu_enterprise
branch
2 times, most recently
from
475d7c0
to
e2cd367
Compare
| @@ -37,5 +37,10 @@ | |||
| hasrestart => $hasrestart, | |||
| subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'] ], | |||
| } | |||
| } elsif $sensu::manage_services and $::sensu::enterprise { | |||
There was a problem hiding this comment.
What about something more like this so we don't declare the sensu-api service twice?
And just to confirm, in SE api should not be running correct?
if $sensu::manage_services {
if $sensu::enterprise {
$ensure = 'stopped'
$enable = false
} elsif $sensu::api {
$ensure = 'running'
$enable = true
} else {
$ensure = 'stopped'
$enable = false
}
service { 'sensu-api':
ensure => $ensure,
enable => $enable,
hasrestart => $hasrestart,
subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'] ],
}
}There was a problem hiding this comment.
Correct, the sensu-enterprise service replaces sensu-api and sensu-server.
Upon reflection, there's actually a gate in init.pp that will fail() if $api and $enterprise are both true, so I think we can simplify this back to the original?
if $sensu::manage_services {
case $sensu::api {
true: {
$ensure = 'running'
$enable = true
}
default: {
$ensure = 'stopped'
$enable = false
}
}
...
should actually work as intended!
There was a problem hiding this comment.
indeed, unit tests and acceptance tests pass!
✅
dhgwilliam
force-pushed
the
sensu_enterprise
branch
from
1cc20dd
to
2ca2934
Compare
[WIP] Sensu Enterprise & Enterprise Dashboard support
|
Thanks for your effort on this! |
this is very much a WIP. feedback welcome. i'm just about to dive in to the types/providers for config. i think i can probably borrow quite a bit of code.
i've also made some presumably debatable decisions which might need to be modified slightly, especially around service management for sensu-server and sensu-api.
i'm smoke testing on centos 6.6, but all the existing (and new) unit tests pass, including debian ones...