From 1511fcdc309da65caf18628ce5bb200db1990724 Mon Sep 17 00:00:00 2001 From: Nicholas Pearson Date: Wed, 19 Jul 2017 10:54:50 +0100 Subject: [PATCH 1/4] Added splunkforwarder_server and splunkforwarder_limits providers/types. --- lib/puppet/provider/splunkforwarder_limits/ini_setting.rb | 8 ++++++++ lib/puppet/provider/splunkforwarder_server/ini_setting.rb | 8 ++++++++ lib/puppet/type/splunkforwarder_limits.rb | 6 ++++++ lib/puppet/type/splunkforwarder_server.rb | 6 ++++++ 4 files changed, 28 insertions(+) create mode 100644 lib/puppet/provider/splunkforwarder_limits/ini_setting.rb create mode 100644 lib/puppet/provider/splunkforwarder_server/ini_setting.rb create mode 100644 lib/puppet/type/splunkforwarder_limits.rb create mode 100644 lib/puppet/type/splunkforwarder_server.rb diff --git a/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb b/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb new file mode 100644 index 00000000..42c3e731 --- /dev/null +++ b/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb @@ -0,0 +1,8 @@ +Puppet::Type.type(:splunkforwarder_limits).provide( + :ini_setting, + parent: Puppet::Type.type(:ini_setting).provider(:splunk) +) do + def self.file_name + 'limits.conf' + end +end diff --git a/lib/puppet/provider/splunkforwarder_server/ini_setting.rb b/lib/puppet/provider/splunkforwarder_server/ini_setting.rb new file mode 100644 index 00000000..88917452 --- /dev/null +++ b/lib/puppet/provider/splunkforwarder_server/ini_setting.rb @@ -0,0 +1,8 @@ +Puppet::Type.type(:splunkforwarder_server).provide( + :ini_setting, + parent: Puppet::Type.type(:ini_setting).provider(:splunk) +) do + def self.file_name + 'server.conf' + end +end diff --git a/lib/puppet/type/splunkforwarder_limits.rb b/lib/puppet/type/splunkforwarder_limits.rb new file mode 100644 index 00000000..95371bf3 --- /dev/null +++ b/lib/puppet/type/splunkforwarder_limits.rb @@ -0,0 +1,6 @@ +require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') + +Puppet::Type.newtype(:splunkforwarder_limits) do + @doc = 'Manage splunkforwarder limit settings in limits.conf' + PuppetX::Puppetlabs::Splunk::Type.clone_type(self) +end diff --git a/lib/puppet/type/splunkforwarder_server.rb b/lib/puppet/type/splunkforwarder_server.rb new file mode 100644 index 00000000..c643d608 --- /dev/null +++ b/lib/puppet/type/splunkforwarder_server.rb @@ -0,0 +1,6 @@ +require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') + +Puppet::Type.newtype(:splunkforwarder_server) do + @doc = 'Manage splunkforwarder server settings in server.conf' + PuppetX::Puppetlabs::Splunk::Type.clone_type(self) +end From 0281ef3172037553b70b745cf2fbefd13fa8a353 Mon Sep 17 00:00:00 2001 From: Nicholas Pearson Date: Wed, 19 Jul 2017 11:12:53 +0100 Subject: [PATCH 2/4] Added splunkforwarder_limits and splunkforwder_server to the forwarder manifest. --- manifests/forwarder.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp index f945517f..c52a1815 100644 --- a/manifests/forwarder.pp +++ b/manifests/forwarder.pp @@ -160,6 +160,8 @@ Package[$package_name] -> Splunkforwarder_props<||> ~> Service[$virtual_service] Package[$package_name] -> Splunkforwarder_transforms<||> ~> Service[$virtual_service] Package[$package_name] -> Splunkforwarder_web<||> ~> Service[$virtual_service] + Package[$package_name] -> Splunkforwarder_limits<||> ~> Service[$virtual_service] + Package[$package_name] -> Splunkforwarder_server<||> ~> Service[$virtual_service] File { owner => $splunk_user, @@ -185,6 +187,16 @@ tag => 'splunk_forwarder', } + file { "${forwarder_confdir}/system/local/limits.conf": + ensure => file, + tag => 'splunk_forwader', + } + + file { "${forwarder_confdir}/system/local/server.conf": + ensure => file, + tag => 'splunk_forwader', + } + # Validate: if both Splunk and Splunk Universal Forwarder are installed on # the same system, then they must use different admin ports. if (defined(Class['splunk']) and defined(Class['splunk::forwarder'])) { From 36219fa6f91e80bfea645683f75b066cf2bf22a3 Mon Sep 17 00:00:00 2001 From: Nicholas Pearson Date: Wed, 19 Jul 2017 11:14:45 +0100 Subject: [PATCH 3/4] Resolved forwader typos. --- manifests/forwarder.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp index c52a1815..2a89d737 100644 --- a/manifests/forwarder.pp +++ b/manifests/forwarder.pp @@ -189,12 +189,12 @@ file { "${forwarder_confdir}/system/local/limits.conf": ensure => file, - tag => 'splunk_forwader', + tag => 'splunk_forwarder', } file { "${forwarder_confdir}/system/local/server.conf": ensure => file, - tag => 'splunk_forwader', + tag => 'splunk_forwarder', } # Validate: if both Splunk and Splunk Universal Forwarder are installed on From cc4b5ddeaf6a4994267ce0d787ca03a34bc8fcc6 Mon Sep 17 00:00:00 2001 From: Nicholas Pearson Date: Wed, 19 Jul 2017 13:05:13 +0100 Subject: [PATCH 4/4] Updated README to include limits/server splunkforwarders. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3808641f..f9d7732b 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,8 @@ the inputs.conf file and refresh the service. * `splunkforwarder_props`: Used to manage ini settings in [props.conf][props.conf-docs] * `splunkforwarder_transforms`: Used to manage ini settings in [transforms.conf][transforms.conf-docs] * `splunkforwarder_web`: Used to manage ini settings in [web.conf][web.conf-docs] +* `splunkforwarder_limits`: Used to manage ini settings in [limits.conf][limits.conf-docs] +* `splunkforwarder_server`: Used to manage ini settings in [server.conf][server.conf-docs] All of the above types use `puppetlabs/ini_file` as a parent and are declared in an identical way, and accept the following parameters: