Add savedsearches.conf to managed files

lib/puppet/provider/splunk_savedsearches/ini_setting.rb

@@ -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

lib/puppet/type/splunk_config.rb

@@ -33,6 +33,7 @@
     :purge_limits,
     :purge_metadata,
     :purge_props,
+    :purge_savedsearches,
     :purge_server,
     :purge_serverclass,
     :purge_transforms,
@@ -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],
@@ -103,6 +105,7 @@ def set_provider_paths
       :splunk_output,
       :splunk_metadata,
       :splunk_props,
+      :splunk_savedsearches,
       :splunk_server,
       :splunk_serverclass,
       :splunk_transforms,

lib/puppet/type/splunk_savedsearches.rb

@@ -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

manifests/addon.pp

@@ -42,6 +42,7 @@
 #
 define splunk::addon (
   Optional[Stdlib::Absolutepath] $splunk_home = undef,
+  Optional[String[1]] $version                = undef,
   Boolean $package_manage                     = true,
   Optional[String[1]] $splunkbase_source      = undef,
   Optional[String[1]] $package_name           = undef,
@@ -70,6 +71,12 @@
 
   if $package_manage {
     if $splunkbase_source {
+
+      if $version {
+        $addon_creates = "${_splunk_home}/etc/apps/${name}/manifest-${version}"
+      } else {
+        $addon_creates = "${_splunk_home}/etc/apps/${name}"
+      }
       $archive_name = $splunkbase_source.split('/')[-1]
       archive { $name:
         path         => "${splunk::params::staging_dir}/${archive_name}",
@@ -78,9 +85,25 @@
         source       => $splunkbase_source,
         extract      => true,
         extract_path => "${_splunk_home}/etc/apps",
-        creates      => "${_splunk_home}/etc/apps/${name}",
+        creates      => "${addon_creates}",
         cleanup      => true,
         before       => File["${_splunk_home}/etc/apps/${name}/local"],
+      } -> file { "${addon_creates}":
+        ensure => present,
+        owner  => $owner,
+        group  => $owner,
+      }
+      exec { "chown -R ${owner}:${owner} ${_splunk_home}/etc/apps/${name}":
+        subscribe => [
+          File["${addon_creates}"]
+        ],
+        refreshonly => true,
+      }
+      exec { "chmod u+rw,g+rw -R ${_splunk_home}/etc/apps/${name}":
+        subscribe => [
+          File["${addon_creates}"]
+        ],
+        refreshonly => true,
       }
     } else {
       package { $package_name:
@@ -122,4 +145,3 @@
     }
   }
 }
-

manifests/enterprise.pp

@@ -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,
@@ -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,

manifests/enterprise/config.pp

@@ -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",
@@ -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']

metadata.json

@@ -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",

spec/classes/enterprise_spec.rb

@@ -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') }

spec/splunk_data.rb

@@ -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',