Skip to content

cleanup code #395

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cleanup code #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions manifests/configfile.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
# @author https://github.com/elastic/puppet-logstash/graphs/contributors
#
define logstash::configfile(
$content = undef,
$source = undef,
$template = undef,
$path = undef,
Optional[String] $content = undef,
Optional[String] $source = undef,
Optional[String] $template = undef,
Optional[String] $path = undef,
)
{
include logstash
Expand All @@ -60,8 +60,10 @@
elsif($content) { $config = $content }
else { $config = undef }

if($path) { $config_file = $path }
else { $config_file = "${logstash::config_dir}/conf.d/${name}" }
$config_file = ? $path {
undef => "${logstash::config_dir}/conf.d/${name}",
default => $path
}

if($config) {
file { $config_file:
Expand Down
46 changes: 19 additions & 27 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,37 +135,29 @@
# @author https://github.com/elastic/puppet-logstash/graphs/contributors
#
class logstash(
$ensure = 'present',
$status = 'enabled',
Boolean $restart_on_change = true,
Boolean $auto_upgrade = false,
$version = undef,
$package_url = undef,
$package_name = 'logstash',
Integer $download_timeout = 600,
$logstash_user = 'logstash',
$logstash_group = 'logstash',
$config_dir = '/etc/logstash',
Boolean $purge_config = true,
$service_provider = undef,
$settings = {},
$startup_options = {},
$jvm_options = [],
Array $pipelines = [],
Boolean $manage_repo = true,
Enum['present', 'absent'] $ensure = 'present',
Enum['enabled', 'disabled', 'running', 'unmanaged'] $status = 'enabled',
Boolean $restart_on_change = true,
Boolean $auto_upgrade = false,
Optional[String] $version = undef,
Optional[String] $package_url = undef,
String $package_name = 'logstash',
Integer $download_timeout = 600,
String $logstash_user = 'logstash',
String $logstash_group = 'logstash',
String $config_dir = '/etc/logstash',
Boolean $purge_config = true,
Optional[String] $service_provider = undef,
Hash $settings = {},
Hash $startup_options = {},
Array $jvm_options = [],
Array $pipelines = [],
Boolean $manage_repo = true,
)
{
$home_dir = '/usr/share/logstash'

if ! ($ensure in [ 'present', 'absent' ]) {
fail("\"${ensure}\" is not a valid ensure parameter value")
}

if ! ($status in [ 'enabled', 'disabled', 'running', 'unmanaged' ]) {
fail("\"${status}\" is not a valid status parameter value")
}

if ($manage_repo == true) {
if $manage_repo {
include elastic_stack::repo
}
include logstash::package
Expand Down
13 changes: 0 additions & 13 deletions manifests/service.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@
'SERVICE_DESCRIPTION' => '"logstash"',
}

$default_jvm_options = [
'-Dfile.encoding=UTF-8',
'-Djava.awt.headless=true',
'-Xms256m',
'-Xmx1g',
'-XX:CMSInitiatingOccupancyFraction=75',
'-XX:+DisableExplicitGC',
'-XX:+HeapDumpOnOutOfMemoryError',
'-XX:+UseCMSInitiatingOccupancyOnly',
'-XX:+UseConcMarkSweepGC',
'-XX:+UseParNewGC',
]

$settings = merge($default_settings, $logstash::settings)
$startup_options = merge($default_startup_options, $logstash::startup_options)
$jvm_options = $logstash::jvm_options
Expand Down