Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows fixes #234

Merged
merged 27 commits into from
May 3, 2019
Merged

Windows fixes #234

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
aaf96b6
correct variables for Windows
Apr 29, 2019
6fcc41b
define missing attributes
Apr 29, 2019
6942f00
correct vars used by package{}
Apr 29, 2019
6d3a167
present error for Windows when ensure is latest
Apr 29, 2019
1c43b60
present error for Windows when ensure is latest
Apr 29, 2019
27d16b8
set package_provider for windows
Apr 29, 2019
d4906f0
ensure Array is returned
Apr 29, 2019
c0aa2be
change $install_options to dynamic type
Apr 29, 2019
796f690
ensure net-tools gets installed first
Apr 29, 2019
df6c551
move out of Sun case
Apr 29, 2019
218da06
fix version var
Apr 29, 2019
d711e7e
strongly type $install_options
May 1, 2019
691b166
verified service name for windows forwarder
May 1, 2019
d8ddfcd
change to fit Tuple type
May 1, 2019
36d040d
fix trailing_comma warning
May 1, 2019
eb009eb
fix bugs for splunk enterprise on windows
May 1, 2019
54bd834
fix install options for enterprise on windows
May 1, 2019
9ca1d89
fix $install_options type for enterprise
May 1, 2019
70756b4
fix $install_options type
May 1, 2019
48b2ef9
catch package_ensure=>latest on Windows
May 1, 2019
6fb42c1
convert integer to string
May 1, 2019
0c59a65
correct package name on windows
May 1, 2019
d3b70b7
disable only_variable_string check
May 1, 2019
d0b6db6
convert to string with function
May 2, 2019
714aada
Update manifests/enterprise.pp
bastelfreak May 3, 2019
ad162d2
alignment and modern fact notation
May 3, 2019
250dd2e
convert to type alias
May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion manifests/enterprise.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
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,
Variant[Tuple[Hash,Hash,String,3,default], 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,
Expand Down Expand Up @@ -250,6 +250,10 @@
)
}

if ($::osfamily == 'windows') and ($package_ensure == 'latest') {
fail('This module does not currently support continuously upgrading Splunk Enterprise on Windows. Please do not set "package_ensure" to "latest" on Windows.')
}

contain 'splunk::enterprise::install'
contain 'splunk::enterprise::config'
contain 'splunk::enterprise::service'
Expand Down
6 changes: 3 additions & 3 deletions manifests/enterprise/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
archive { $_staged_package:
source => $_package_source,
extract => false,
before => Package[$splunk::enterprise::enterprise_package_name],
before => Package[$splunk::enterprise::package_name],
}
} else {
$_staged_package = undef
Expand All @@ -35,8 +35,8 @@
},
}

package { $splunk::enterprise::enterprise_package_name:
ensure => $splunk::enterprise::enterprise_package_ensure,
package { $splunk::enterprise::package_name:
ensure => $splunk::enterprise::package_ensure,
provider => $splunk::enterprise::package_provider,
install_options => $splunk::enterprise::install_options,
}
Expand Down
5 changes: 4 additions & 1 deletion manifests/enterprise/install/nix.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@

# Required for splunk 7.2.4.2
if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 {
ensure_packages(['net-tools'], {'ensure' => 'present'})
ensure_packages(['net-tools'], {
'ensure' => 'present',
before => Package[$splunk::enterprise::enterprise_package_name]
})
}

}
6 changes: 5 additions & 1 deletion manifests/forwarder.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
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::forwarder_install_options,
Variant[Tuple[Hash,String,1,default], Array[String[1]]] $install_options = $splunk::params::forwarder_install_options,
String[1] $splunk_user = $splunk::params::splunk_user,
Stdlib::Absolutepath $forwarder_homedir = $splunk::params::forwarder_homedir,
Stdlib::Absolutepath $forwarder_confdir = $splunk::params::forwarder_confdir,
Expand Down Expand Up @@ -214,6 +214,10 @@
)
}

if ($::osfamily == 'windows') and ($package_ensure == 'latest') {
fail('This module does not currently support continuously upgrading the Splunk Universal Forwarder on Windows. Please do not set "package_ensure" to "latest" on Windows.')
}

contain 'splunk::forwarder::install'
contain 'splunk::forwarder::config'
contain 'splunk::forwarder::service'
Expand Down
12 changes: 10 additions & 2 deletions manifests/forwarder/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,16 @@
}
}

package { $splunk::forwarder::forwarder_package_name:
ensure => $splunk::forwarder::forwarder_package_ensure,
# Required for splunk 7.2.4.2
if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) {
ensure_packages(['net-tools'], {
'ensure' => 'present',
before => Package[$splunk::forwarder::package_name]
})
}

package { $splunk::forwarder::package_name:
ensure => $splunk::forwarder::package_ensure,
provider => $splunk::forwarder::package_provider,
install_options => $splunk::forwarder::install_options,
}
Expand Down
87 changes: 46 additions & 41 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

if $::osfamily == 'windows' {
$staging_dir = "${facts['archive_windir']}\\splunk"
$enterprise_homedir = pick($enterprise_installdir, 'C:/Program Files/Splunk')
$enterprise_homedir = pick($enterprise_installdir, 'C:\\Program Files\\Splunk')
$forwarder_homedir = pick($forwarder_installdir, 'C:\\Program Files\\SplunkUniversalForwarder')
} else {
$staging_dir = '/opt/staging/splunk'
Expand All @@ -135,17 +135,17 @@
# Settings common to a kernel
case $::kernel {
'Linux': {
$path_delimiter = '/'
$forwarder_src_subdir = 'linux'
$forwarder_password_config_file = "${forwarder_homedir}/etc/passwd"
$enterprise_password_config_file = "${enterprise_homedir}/etc/passwd"
$forwarder_secret_file = "${forwarder_homedir}/etc/splunk.secret"
$enterprise_secret_file = "${enterprise_homedir}/etc/splunk.secret"
$forwarder_confdir = "${forwarder_homedir}/etc"
$enterprise_src_subdir = 'linux'
$enterprise_confdir = "${enterprise_homedir}/etc"
$forwarder_install_options = []
$enterprise_install_options = []
$path_delimiter = '/'
$forwarder_src_subdir = 'linux'
$forwarder_password_config_file = "${forwarder_homedir}/etc/passwd"
$enterprise_password_config_file = "${enterprise_homedir}/etc/passwd"
$forwarder_secret_file = "${forwarder_homedir}/etc/splunk.secret"
$enterprise_secret_file = "${enterprise_homedir}/etc/splunk.secret"
$forwarder_confdir = "${forwarder_homedir}/etc"
$enterprise_src_subdir = 'linux'
$enterprise_confdir = "${enterprise_homedir}/etc"
$forwarder_install_options = []
$enterprise_install_options = []
# Systemd not supported until Splunk 7.2.2
if $facts['service_provider'] == 'systemd' and versioncmp($version, '7.2.2') >= 0 {
$enterprise_service = 'Splunkd'
Expand All @@ -161,15 +161,17 @@
}
}
'SunOS': {
$path_delimiter = '/'
$forwarder_src_subdir = 'solaris'
$password_config_file = "${forwarder_homedir}/etc/passwd"
$secret_file = "${forwarder_homedir}/etc/splunk.secret"
$forwarder_confdir = "${forwarder_homedir}/etc"
$enterprise_src_subdir = 'solaris'
$enterprise_confdir = "${enterprise_homedir}/etc"
$forwarder_install_options = []
$enterprise_install_options = []
$path_delimiter = '/'
$forwarder_src_subdir = 'solaris'
$forwarder_password_config_file = "${forwarder_homedir}/etc/passwd"
$enterprise_password_config_file = "${enterprise_homedir}/etc/passwd"
$forwarder_secret_file = "${forwarder_homedir}/etc/splunk.secret"
$enterprise_secret_file = "${enterprise_homedir}/etc/splunk.secret"
$forwarder_confdir = "${forwarder_homedir}/etc"
$enterprise_src_subdir = 'solaris'
$enterprise_confdir = "${enterprise_homedir}/etc"
$forwarder_install_options = []
$enterprise_install_options = []
# Systemd not supported until Splunk 7.2.2
if $facts['service_provider'] == 'systemd' and versioncmp($version, '7.2.2') >= 0 {
$enterprise_service = 'Splunkd'
Expand All @@ -185,16 +187,21 @@
}
}
'windows': {
$path_delimiter = '\\'
$forwarder_src_subdir = 'windows'
$password_config_file = 'C:/Program Files/SplunkUniversalForwarder/etc/passwd'
$secret_file = 'C:/Program Files/SplunkUniversalForwarder/etc/splunk.secret'
$forwarder_service = 'SplunkForwarder' # UNKNOWN
$forwarder_confdir = "${forwarder_homedir}/etc"
$enterprise_src_subdir = 'windows'
$enterprise_service = 'splunkd' # UNKNOWN
$enterprise_confdir = "${enterprise_homedir}/etc"
$forwarder_install_options = [
$path_delimiter = '\\'
$forwarder_src_subdir = 'windows'
$forwarder_password_config_file = "${forwarder_homedir}\\etc\\passwd"
$enterprise_password_config_file = "${enterprise_homedir}\\etc\\passwd"
$forwarder_secret_file = "${forwarder_homedir}\\etc\\splunk.secret"
$enterprise_secret_file = "${enterprise_homedir}\\etc\\splunk.secret"
$forwarder_service = 'SplunkForwarder'
$forwarder_service_file = "${forwarder_homedir}\\dummy" # Not used in Windows, but attribute must be defined with a valid path
$forwarder_confdir = "${forwarder_homedir}\\etc"
$enterprise_src_subdir = 'windows'
$enterprise_service = 'splunkd' # Not validated
$enterprise_service_file = "${enterprise_homedir}\\dummy" # Not used in Windows, but attribute must be defined with a valid path
$enterprise_confdir = "${enterprise_homedir}\\etc"
$forwarder_install_options = [
{ 'INSTALLDIR' => $forwarder_homedir },
'AGREETOLICENSE=Yes',
'LAUNCHSPLUNK=0',
'SERVICESTARTTYPE=auto',
Expand All @@ -204,15 +211,12 @@
'WINEVENTLOG_FWD_ENABLE=1',
'WINEVENTLOG_SET_ENABLE=1',
'ENABLEADMON=1',
{ 'INSTALLDIR' => $forwarder_homedir },
]
$enterprise_install_options = [
'LAUNCHSPLUNK=1',
'WINEVENTLOG_APP_ENABLE=1',
'WINEVENTLOG_SEC_ENABLE=1',
'WINEVENTLOG_SYS_ENABLE=1',
'WINEVENTLOG_FWD_ENABLE=1',
'WINEVENTLOG_SET_ENABLE=1',
$enterprise_install_options = [
{ 'INSTALLDIR' => $enterprise_homedir },
{ 'SPLUNKD_PORT' => String($splunkd_port) },
'AGREETOLICENSE=Yes',
'LAUNCHSPLUNK=0',
]
}
default: { fail("splunk module does not support kernel ${::kernel}") }
Expand Down Expand Up @@ -246,6 +250,7 @@
'RedHat': { $package_provider = 'rpm' }
'Debian': { $package_provider = 'dpkg' }
'Solaris': { $package_provider = 'sun' }
'windows': { $package_provider = 'windows' }
default: { $package_provider = undef } # Don't define a $package_provider
}

Expand Down Expand Up @@ -274,12 +279,12 @@
/^(W|w)indows (x86|i386)$/: {
$package_suffix = "${version}-${build}-x86-release.msi"
$forwarder_package_name = 'UniversalForwarder'
$enterprise_package_name = 'Splunk'
$enterprise_package_name = 'Splunk Enterprise'
}
/^(W|w)indows (x64|x86_64)$/: {
$package_suffix = "${version}-${build}-x64-release.msi"
$forwarder_package_name = 'UniversalForwarder'
$enterprise_package_name = 'Splunk'
$enterprise_package_name = 'Splunk Enterprise'
}
'Solaris i86pc': {
$package_suffix = "${version}-${build}-solaris-10-intel.pkg"
Expand Down