Skip to content

Commit

Permalink
Merge f1e2a58 into e9500e7
Browse files Browse the repository at this point in the history
  • Loading branch information
bsg-sfrazer committed Jul 19, 2019
2 parents e9500e7 + f1e2a58 commit f5754e5
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 1 deletion.
8 changes: 8 additions & 0 deletions lib/puppet/provider/splunk_savedsearches/ini_setting.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Puppet::Type.type(:splunk_savedsearches).provide(
:ini_setting,
parent: Puppet::Type.type(:ini_setting).provider(:splunk)
) do
def self.file_name
'savedsearches.conf'
end
end
3 changes: 3 additions & 0 deletions lib/puppet/type/splunk_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
:purge_limits,
:purge_metadata,
:purge_props,
:purge_savedsearches,
:purge_server,
:purge_serverclass,
:purge_transforms,
Expand Down Expand Up @@ -71,6 +72,7 @@ def generate
Puppet::Type::Splunk_indexes => self[:purge_indexes],
Puppet::Type::Splunk_metadata => self[:purge_metadata],
Puppet::Type::Splunk_props => self[:purge_props],
Puppet::Type::Splunk_savedsearches => self[:purge_savedsearches],
Puppet::Type::Splunk_server => self[:purge_server],
Puppet::Type::Splunk_serverclass => self[:purge_serverclass],
Puppet::Type::Splunk_transforms => self[:purge_transforms],
Expand Down Expand Up @@ -103,6 +105,7 @@ def set_provider_paths
:splunk_output,
:splunk_metadata,
:splunk_props,
:splunk_savedsearches,
:splunk_server,
:splunk_serverclass,
:splunk_transforms,
Expand Down
6 changes: 6 additions & 0 deletions lib/puppet/type/splunk_savedsearches.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type')

Puppet::Type.newtype(:splunk_savedsearches) do
@doc = 'Manage splunk settings in savedsearches.conf'
PuppetX::Puppetlabs::Splunk::Type.clone_type(self)
end
2 changes: 2 additions & 0 deletions manifests/enterprise.pp
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
Boolean $purge_limits = false,
Boolean $purge_outputs = false,
Boolean $purge_props = false,
Boolean $purge_savedsearches = false,
Boolean $purge_server = false,
Boolean $purge_serverclass = false,
Boolean $purge_transforms = false,
Expand Down Expand Up @@ -259,6 +260,7 @@
purge_limits => $purge_limits,
purge_outputs => $purge_outputs,
purge_props => $purge_props,
purge_savedsearches => $purge_server,
purge_server => $purge_server,
purge_serverclass => $purge_serverclass,
purge_transforms => $purge_transforms,
Expand Down
2 changes: 2 additions & 0 deletions manifests/enterprise/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"${splunk::enterprise::enterprise_homedir}/etc/system/local/limits.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/outputs.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/props.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/savedsearches.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/server.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/serverclass.conf",
"${splunk::enterprise::enterprise_homedir}/etc/system/local/transforms.conf",
Expand Down Expand Up @@ -106,6 +107,7 @@
File <| tag == 'splunk_enterprise' |> -> Splunk_limits<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_output<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_props<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_savedsearches<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_server<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_serverclass<||> ~> Class['splunk::enterprise::service']
File <| tag == 'splunk_enterprise' |> -> Splunk_transforms<||> ~> Class['splunk::enterprise::service']
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-splunk",
"version": "7.3.1-rc0",
"version": "7.3.2",
"author": "Vox Pupuli",
"summary": "Manage and deploy Splunk servers and forwarders",
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions spec/classes/enterprise_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
it { is_expected.to contain_file('/opt/splunk/etc/system/local/limits.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/outputs.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/props.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/savedsearches.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/server.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/serverclass.conf') }
it { is_expected.to contain_file('/opt/splunk/etc/system/local/transforms.conf') }
Expand Down
1 change: 1 addition & 0 deletions spec/splunk_data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
splunk_metadata: 'local.meta',
splunk_output: 'outputs.conf',
splunk_props: 'props.conf',
splunk_savedsearches: 'savedsearches.conf',
splunk_server: 'server.conf',
splunk_serverclass: 'serverclass.conf',
splunk_transforms: 'transforms.conf',
Expand Down

0 comments on commit f5754e5

Please sign in to comment.