Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195874
Change subject: logstash: resource attributes quoting
......................................................................
logstash: resource attributes quoting
Bug: T91908
Change-Id: Ice0e06973865bdc0049f809b8f8d845371b7ab2d
---
M modules/logstash/manifests/init.pp
M modules/logstash/manifests/input/gelf.pp
M modules/logstash/manifests/input/irc.pp
M modules/logstash/manifests/input/redis.pp
M modules/logstash/manifests/input/syslog.pp
M modules/logstash/manifests/input/tcp.pp
M modules/logstash/manifests/input/udp2log.pp
M modules/logstash/manifests/output/elasticsearch.pp
8 files changed, 32 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/195874/1
diff --git a/modules/logstash/manifests/init.pp
b/modules/logstash/manifests/init.pp
index bd0b885..8d9301d 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -16,8 +16,8 @@
# }
#
class logstash(
- $heap_memory_mb = 64,
- $filter_workers = 1,
+ $heap_memory_mb = '64',
+ $filter_workers = '1',
) {
include ::elasticsearch::packages
@@ -37,7 +37,7 @@
}
file { '/etc/logstash/conf.d':
- ensure => directory,
+ ensure => 'directory',
recurse => true,
purge => true,
force => true,
@@ -46,7 +46,7 @@
}
service { 'logstash':
- ensure => running,
+ ensure => 'running',
provider => 'debian',
enable => true,
hasstatus => true,
@@ -54,12 +54,12 @@
}
file { '/etc/init/logstash.conf':
- ensure => absent,
+ ensure => 'absent',
require => Package['logstash'],
}
file { '/etc/init/logstash-web.conf':
- ensure => absent,
+ ensure => 'absent',
require => Package['logstash'],
}
}
diff --git a/modules/logstash/manifests/input/gelf.pp
b/modules/logstash/manifests/input/gelf.pp
index a7a5afa..f11eea2 100644
--- a/modules/logstash/manifests/input/gelf.pp
+++ b/modules/logstash/manifests/input/gelf.pp
@@ -16,9 +16,9 @@
# }
#
define logstash::input::gelf(
- $ensure = present,
- $port = 12201,
- $priority = 10,
+ $ensure = 'present',
+ $port = '12201',
+ $priority = '10',
) {
logstash::conf { "input-gelf-${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/input/irc.pp
b/modules/logstash/manifests/input/irc.pp
index d0d25a1..2c2817c 100644
--- a/modules/logstash/manifests/input/irc.pp
+++ b/modules/logstash/manifests/input/irc.pp
@@ -24,15 +24,15 @@
#
define logstash::input::irc(
$channels,
- $ensure = present,
+ $ensure = 'present',
$host = 'chat.freenode.net',
- $port = 6697,
+ $port = '6697',
$secure = true,
$user = 'logstash',
$password = undef,
$nick = 'logstash',
$real = 'logstash',
- $priority = 10,
+ $priority = '10',
) {
logstash::conf { "input-irc${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/input/redis.pp
b/modules/logstash/manifests/input/redis.pp
index 00a3e93..54ad4e8 100644
--- a/modules/logstash/manifests/input/redis.pp
+++ b/modules/logstash/manifests/input/redis.pp
@@ -22,13 +22,13 @@
# }
#
define logstash::input::redis(
- $ensure = present,
+ $ensure = 'present',
$host = '127.0.0.1',
- $port = 6379,
+ $port = '6379',
$data_type = 'list',
$key = 'logstash',
$password = undef,
- $priority = 10,
+ $priority = '10',
) {
logstash::conf { "input-redis-${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/input/syslog.pp
b/modules/logstash/manifests/input/syslog.pp
index b68dfc5..401d1ab 100644
--- a/modules/logstash/manifests/input/syslog.pp
+++ b/modules/logstash/manifests/input/syslog.pp
@@ -16,9 +16,9 @@
# }
#
define logstash::input::syslog(
- $ensure = present,
- $port = 514,
- $priority = 10,
+ $ensure = 'present',
+ $port = '514',
+ $priority = '10',
) {
logstash::conf { "input-syslog-${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/input/tcp.pp
b/modules/logstash/manifests/input/tcp.pp
index eb3827e..4d2b708 100644
--- a/modules/logstash/manifests/input/tcp.pp
+++ b/modules/logstash/manifests/input/tcp.pp
@@ -18,10 +18,10 @@
# }
#
define logstash::input::tcp(
- $ensure = present,
- $port = 5229,
+ $ensure = 'present',
+ $port = '5229',
$codec = 'plain',
- $priority = 10,
+ $priority = '10',
) {
logstash::conf { "input-tcp-${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/input/udp2log.pp
b/modules/logstash/manifests/input/udp2log.pp
index f61357a..17df637 100644
--- a/modules/logstash/manifests/input/udp2log.pp
+++ b/modules/logstash/manifests/input/udp2log.pp
@@ -16,9 +16,9 @@
# }
#
define logstash::input::udp2log(
- $ensure = present,
- $port = 8324,
- $priority = 10,
+ $ensure = 'present',
+ $port = '8324',
+ $priority = '10',
) {
logstash::conf { "input-udp2log-${title}":
ensure => $ensure,
diff --git a/modules/logstash/manifests/output/elasticsearch.pp
b/modules/logstash/manifests/output/elasticsearch.pp
index 9697db4..23fd253 100644
--- a/modules/logstash/manifests/output/elasticsearch.pp
+++ b/modules/logstash/manifests/output/elasticsearch.pp
@@ -30,15 +30,15 @@
#
class logstash::output::elasticsearch(
$host = '127.0.0.1',
- $flush_size = 100,
- $idle_flush_time = 1,
+ $flush_size = '100',
+ $idle_flush_time = '1',
$index = 'logstash-%{+YYYY.MM.dd}',
- $port = 9200,
+ $port = '9200',
$replication = 'sync',
$require_tag = undef,
$manage_indices = false,
- $priority = 10,
- $ensure = present,
+ $priority = '10',
+ $ensure = 'present',
) {
$uri = "http://${host}:${port}";
@@ -75,8 +75,8 @@
ensure => $ensure_cron,
command => "/usr/local/bin/logstash_delete_index.sh ${uri}",
user => 'root',
- hour => 0,
- minute => 42,
+ hour => '0',
+ minute => '42',
require => File['/usr/local/bin/logstash_delete_index.sh'],
}
@@ -84,7 +84,7 @@
ensure => $ensure_cron,
command => "/usr/local/bin/logstash_optimize_index.sh ${uri}",
user => 'root',
- hour => 1,
+ hour => '1',
# Stagger execution on each node of cluster to avoid running in
# parallel.
minute => 5 * fqdn_rand(12, 'logstash_optimize_index'),
--
To view, visit https://gerrit.wikimedia.org/r/195874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice0e06973865bdc0049f809b8f8d845371b7ab2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
