Refactor defined type Splunk::Addon #224
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ody
force-pushed
the
refactor_addon_management
branch
from
fbffdcc to
0c128b3
Compare
Transitions the defined type Splunk::Addon to using the splunk*_input types instead of concat, supports installation from splunkbase provided archive, and valid for use on more than just forwarder nodes.
Commit introduces Puppet Strings documentation to the newly refactored defined type Splunk::Addon
ody
force-pushed
the
refactor_addon_management
branch
from
0c128b3 to
23c5d8d
Compare
Minor tweak to supporting spec test to reflect the ability to install from splunkbase archives
ody
changed the title
Commit adds defults to case statements with a fail message that should trigger if Class[splunk::enterprise] or Class[splunk::forwarder] are not declared that informs the use of the reason for the failure.
|
Thanks! |
alexjfisher
reviewed
Apr 11, 2019
| concat { "splunk::addon::inputs_${name}": | ||
| path => "${_splunk_home}/etc/apps/${name}/local/inputs.conf", | ||
| require => File["${_splunk_home}/etc/apps/${name}/local"], | ||
| unless $inputs.empty { |
There was a problem hiding this comment.
Why? Iterating an empty hash is fine.
There was a problem hiding this comment.
You are correct. Just didn't realize. Tested just now and works fine without testing first
| case $mode { | ||
| 'forwarder': { $_splunk_home = $splunk::params::forwarder_homedir } | ||
| 'enterprise': { $_splunk_home = $splunk::params::enterprise_homedir } | ||
| default: { fail('Instances of Splunk::Addon require the declaration of one of either Class[splunk::enterprise] or Class[splunk::forwarder]') } |
There was a problem hiding this comment.
Correct and the reason I didn't originally add the default statement. Only added it to get it to pass lint checks. Not a bad thing to have, I suppose...?
If the manifest parses this far then something strange is happening an it'd be good to explicitly fail before damage is done.
|
|
||
| if defined(Class['splunk::forwarder']) { | ||
| $mode = 'forwarder' | ||
| } else { |
There was a problem hiding this comment.
Is it worth checking that Class['splunk'] has been defined?
There was a problem hiding this comment.
Class['splunk'] is now completely empty since the 7.2 refactor: https://github.com/voxpupuli/puppet-splunk/pull/215/files#diff-60ae41fd0a31977447947f59940ee9a4
There was a problem hiding this comment.
Sorry, splunk::enterprise then.
| Optional[String[1]] $package_name = undef, | ||
| Hash $inputs = {}, | ||
| ) { | ||
|
|
||
| include 'splunk::params' | ||
| include splunk::params |
There was a problem hiding this comment.
Shouldn’t be necessary if it’s a requirement that one of splunk or splunk:forwarder has been included already?
There was a problem hiding this comment.
Yes, that should be correct. Didn't dawn me at the time.
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 11, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 11, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 12, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 17, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 17, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
ody
added a commit
to ody/puppet-splunk
that referenced
this pull request
Apr 18, 2019
Removes declaration of Class[splunk::params] since it should already be in scope and declared by either Class[splunk::enterprise] or Class[splunk::forwarder] and removes an unnecessary test of an empty hash. Modifies Splunk::Addon spec test to address the removal of Class[splunk::params].
alexjfisher
added a commit
that referenced
this pull request
Apr 30, 2019
Address post-merge comments on PR #224
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Transitions the defined type Splunk::Addon to using the splunk*_input types instead of concat, supports installation from splunkbase provided archive, and valid for use on more than just forwarder nodes.