Merge pull request #215 from nick-markowski/7_2_support

Add 7.2 support and refactor module

Author: alexjfisher

README.md

@@ -12,7 +12,7 @@ class << self
   end
 
   def self.file_path
-    raise Puppet::Error, 'file_path must be set with splunk_config type before provider can be used' if @file_path.nil?
+    raise Puppet::Error, 'file_path must be set with splunkenterprise_config or splunkforwarder_config type before provider can be used' if @file_path.nil?
     raise Puppet::Error, 'Child provider class does not support a file_name method' unless respond_to?(:file_name)
     @file_path
   end

lib/puppet/provider/ini_setting/splunk.rb

@@ -32,30 +32,37 @@
 #   }
 # }
 #
-
 define splunk::addon (
-  $splunk_home                   = '/opt/splunkforwarder',
-  $package_manage                = true,
-  Optional[String] $package_name = undef,
-  $inputs                        = {},
+  Optional[Stdlib::Absolutepath] $splunk_home = undef,
+  Boolean $package_manage                     = true,
+  Optional[String[1]] $package_name           = undef,
+  Hash $inputs                                = {},
 ) {
 
+  include 'splunk::params'
+
+  if $splunk_home {
+    $_splunk_home = $splunk_home
+  }
+  else {
+    $_splunk_home = $splunk::params::forwarder_homedir
+  }
 
   if $package_manage {
     package { $package_name:
       ensure => installed,
-      before => File["${splunk_home}/etc/apps/${name}/local"],
+      before => File["${_splunk_home}/etc/apps/${name}/local"],
     }
   }
 
-  file { "${splunk_home}/etc/apps/${name}/local":
+  file { "${_splunk_home}/etc/apps/${name}/local":
     ensure => directory,
   }
 
   if $inputs {
     concat { "splunk::addon::inputs_${name}":
-      path    => "${splunk_home}/etc/apps/${name}/local/inputs.conf",
-      require => File["${splunk_home}/etc/apps/${name}/local"],
+      path    => "${_splunk_home}/etc/apps/${name}/local/inputs.conf",
+      require => File["${_splunk_home}/etc/apps/${name}/local"],
     }
 
     create_resources('splunk::addon::input', $inputs, {'addon' =>  $name })

manifests/addon.pp

@@ -1,5 +1,5 @@
-# Private defined type callled by splunk::addon
-
+# Private defined type called by splunk::addon
+#
 define splunk::addon::input (
   $addon,
   $attributes={},

manifests/addon/input.pp

@@ -0,0 +1,280 @@
+# Class splunk::enterprise
+#
+# @param version
+#
+# Specifies the version of Splunk Enterprise the module should install and
+# manage.  Defaults to the value set in splunk::params.
+#
+# @param package_name
+#
+# The name of the package(s) Puppet will use to install Splunk.
+#
+# @param package_ensure
+#
+# Ensure parameter which will get passed to the Splunk package resource.
+# Defaults to the value in splunk::params.
+#
+# @param staging_dir
+#
+# Root of the archive path to host the Splunk package.  Defaults to the value in
+# splunk::params.
+#
+# @param path_delimiter
+#
+# The path separator used in the archived path of the Splunk package.  Defaults to
+# the value in splunk::params.
+#
+# @param enterprise_package_src
+#
+# The source URL for the splunk installation media (typically an RPM, MSI,
+# etc). If a `$src_root` parameter is set in splunk::params, this will be
+# automatically supplied. Otherwise it is required. The URL can be of any
+# protocol supported by the nanliu/staging module. On Windows, this can be
+# a UNC path to the MSI. Defaults to the value in splunk::params.
+#
+# @param package_provider
+#
+# The package management system used to host the Splunk packages.  Defaults to the
+# value in splunk::params.
+#
+# @param manage_package_source
+#
+# Whether or not to use the supplied `enterprise_package_src` param.  Defaults to
+# true.
+#
+# @param package_source
+#
+# *Optional* The source URL for the splunk installation media (typically an RPM,
+# MSI, etc). If `enterprise_package_src` parameter is set in splunk::params and
+# `manage_package_source` is true, this will be automatically supplied. Otherwise
+# it is required. The URL can be of any protocol supported by the nanliu/staging
+# module. On Windows, this can be a UNC path to the MSI.  Defaults to undef.
+#
+# @param install_options
+#
+# This variable is passed to the package resources' *install_options* parameter.
+# Defaults to the value in ::splunk::params.
+#
+# @param splunk_user
+#
+# The user to run Splunk as. Defaults to the value set in splunk::params.
+#
+# @param enterprise_homedir
+#
+# Specifies the Splunk Enterprise home directory.  Defaults to the value set in
+# splunk::params.
+#
+# @param enterprise_confdir
+#
+# Specifies the Splunk Enterprise configuration directory.  Defaults to the value
+# set in splunk::params.
+#
+# @param service_name
+#
+# The name of the Splunk Enterprise service.  Defaults to the value set in
+# splunk::params.
+#
+# @param service_file
+#
+# The path to the Splunk Enterprise service file.  Defaults to the value set in
+# splunk::params.
+#
+# @param boot_start
+#
+# Whether or not to enable splunk boot-start, which generates a service file to
+# manage the Splunk Enterprise service.  Defaults to the value set in
+# splunk::params.
+#
+# @param use_default_config
+#
+# Whether or not the module should manage a default set of Splunk Enterprise
+# configuration parameters.  Defaults to true.
+#
+# @param input_default_host
+#
+# Part of the default config.  Sets the `splunk_input` default host.  Defaults to
+# `facts['fqdn']`.
+#
+# @param input_connection_host
+#
+# Part of the default config.  Sets the `splunk_input` connection host.  Defaults
+# to dns.
+#
+# @param splunkd_listen
+#
+# The address on which splunkd should listen. Defaults to 127.0.0.1.
+#
+# @param logging_port
+#
+# The port to receive TCP logs on. Defaults to the port specified in
+# splunk::params.
+#
+# @param splunkd_port
+#
+# The management port for Splunk. Defaults to the value set in splunk::params.
+#
+# @param web_port
+#
+# The port on which to service the Splunk Web interface. Defaults to 8000.
+#
+# @param purge_inputs
+#
+# If set to true, inputs.conf will be purged of configuration that is
+# no longer managed by the `splunk_input` type. Defaults to false.
+#
+# @param purge_outputs
+#
+# If set to true, outputs.conf will be purged of configuration that is
+# no longer managed by the `splunk_output` type. Defaults to false.
+#
+# @param purge_authentication
+#
+# If set to true, authentication.conf will be purged of configuration
+# that is no longer managed by the `splunk_authentication` type. Defaults to false.
+#
+# @param purge_authorize
+#
+# If set to true, authorize.conf will be purged of configuration that
+# is no longer managed by the `splunk_authorize` type. Defaults to false.
+#
+# @param purge_distsearch
+#
+# If set to true, distsearch.conf will be purged of configuration that
+# is no longer managed by the `splunk_distsearch` type. Defaults to false.
+#
+# @param purge_indexes
+#
+# If set to true, indexes.conf will be purged of configuration that is
+# no longer managed by the `splunk_indexes` type. Defaults to false.
+#
+# @param purge_limits
+#
+# If set to true, limits.conf will be purged of configuration that is
+# no longer managed by the `splunk_limits` type. Defaults to false.
+#
+# @param purge_props
+#
+# If set to true, props.conf will be purged of configuration that is
+# no longer managed by the `splunk_props` type. Defaults to false.
+#
+# @param purge_server
+#
+# If set to true, server.conf will be purged of configuration that is
+# no longer managed by the `splunk_server` type. Defaults to false.
+#
+# @param purge_transforms
+#
+# If set to true, transforms.conf will be purged of configuration that
+# is no longer managed by the `splunk_transforms` type. Defaults to false.
+#
+# @param purge_web
+#
+# If set to true, web.conf will be purged of configuration that is no
+# longer managed by the `splunk_web type`. Defaults to false.
+#
+# @param manage_password
+#
+# If set to true, Manage the contents of splunk.secret and passwd.  Defaults to
+# the value set in splunk::params.
+#
+# @param password_config_file
+#
+# Which file to put the password in i.e. in linux it would be
+# /opt/splunk/etc/passwd.  Defaults to the value set in splunk::params.
+#
+# @param password_content
+#
+# The hashed password username/details for the user.  Defaults to the value set
+# in splunk::params.
+#
+# @param secret_file
+#
+# Which file we should put the secret in.  Defaults to the value set in
+# splunk::params.
+#
+# @param secret
+#
+# The secret used to salt the splunk password.  Defaults to the value set in
+# splunk::params.
+#
+#
+class splunk::enterprise (
+  String[1] $version                         = $splunk::params::version,
+  String[1] $package_name                    = $splunk::params::enterprise_package_name,
+  String[1] $package_ensure                  = $splunk::params::enterprise_package_ensure,
+  String[1] $staging_dir                     = $splunk::params::staging_dir,
+  String[1] $path_delimiter                  = $splunk::params::path_delimiter,
+  String[1] $enterprise_package_src          = $splunk::params::enterprise_package_src,
+  Optional[String[1]] $package_provider      = $splunk::params::package_provider,
+  Boolean $manage_package_source             = true,
+  Optional[String[1]] $package_source        = undef,
+  Array[String[1]] $install_options          = $splunk::params::enterprise_install_options,
+  String[1] $splunk_user                     = $splunk::params::splunk_user,
+  Stdlib::Absolutepath $enterprise_homedir   = $splunk::params::enterprise_homedir,
+  Stdlib::Absolutepath $enterprise_confdir   = $splunk::params::enterprise_confdir,
+  String[1] $service_name                    = $splunk::params::enterprise_service,
+  Stdlib::Absolutepath $service_file         = $splunk::params::enterprise_service_file,
+  Boolean $boot_start                        = $splunk::params::boot_start,
+  Boolean $use_default_config                = true,
+  String[1] $input_default_host              = $facts['fqdn'],
+  String[1] $input_connection_host           = 'dns',
+  Stdlib::IP::Address $splunkd_listen        = '127.0.0.1',
+  Stdlib::Port $splunkd_port                 = $splunk::params::splunkd_port,
+  Stdlib::Port $logging_port                 = $splunk::params::logging_port,
+  Stdlib::Port $web_httpport                 = 8000,
+  Boolean $purge_alert_actions               = false,
+  Boolean $purge_authentication              = false,
+  Boolean $purge_authorize                   = false,
+  Boolean $purge_deploymentclient            = false,
+  Boolean $purge_distsearch                  = false,
+  Boolean $purge_indexes                     = false,
+  Boolean $purge_inputs                      = false,
+  Boolean $purge_limits                      = false,
+  Boolean $purge_outputs                     = false,
+  Boolean $purge_props                       = false,
+  Boolean $purge_server                      = false,
+  Boolean $purge_serverclass                 = false,
+  Boolean $purge_transforms                  = false,
+  Boolean $purge_uiprefs                     = false,
+  Boolean $purge_web                         = false,
+  Boolean $manage_password                   = $splunk::params::manage_password,
+  Stdlib::Absolutepath $password_config_file = $splunk::params::enterprise_password_config_file,
+  String[1] $password_content                = $splunk::params::password_content,
+  Stdlib::Absolutepath $secret_file          = $splunk::params::enterprise_secret_file,
+  String[1] $secret                          = $splunk::params::secret,
+
+) inherits splunk {
+
+  if (defined(Class['splunk::forwarder'])) {
+    fail('Splunk Universal Forwarder provides a subset of Splunk Enterprise capabilities, and has potentially conflicting resources when included with Splunk Enterprise on the same node.  Do not include splunk::forwarder on the same node as splunk::enterprise.  Configure Splunk Enterprise to meet your forwarding needs.'
+    )
+  }
+
+  contain 'splunk::enterprise::install'
+  contain 'splunk::enterprise::config'
+  contain 'splunk::enterprise::service'
+
+  Class['splunk::enterprise::install']
+  -> Class['splunk::enterprise::config']
+  ~> Class['splunk::enterprise::service']
+
+  # Purge resources if option set
+  Splunk_config['splunk'] {
+    purge_alert_actions    => $purge_alert_actions,
+    purge_authentication   => $purge_authentication,
+    purge_authorize        => $purge_authorize,
+    purge_deploymentclient => $purge_deploymentclient,
+    purge_distsearch       => $purge_distsearch,
+    purge_indexes          => $purge_indexes,
+    purge_inputs           => $purge_inputs,
+    purge_limits           => $purge_limits,
+    purge_outputs          => $purge_outputs,
+    purge_props            => $purge_props,
+    purge_server           => $purge_server,
+    purge_serverclass      => $purge_serverclass,
+    purge_transforms       => $purge_transforms,
+    purge_uiprefs          => $purge_uiprefs,
+    purge_web              => $purge_web
+  }
+
+}