Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389483 )
Change subject: logstash: split logstash_syslog hiera setting
......................................................................
logstash: split logstash_syslog hiera setting
Split the logstash_syslog hiera setting into logstash_host /
logstash_syslog_port so that the hostname can be used in multiple
profiles regardless of the service being used (eg: syslog vs. gelf).
Change-Id: I902d0083d64c8b9d67b0b013b218d8834281ec0b
---
M hieradata/common.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/profile/manifests/mediawiki/common.pp
3 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/389483/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 91be44f..051e69c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -561,7 +561,8 @@
# Logging: logstash, udp2log
-logstash_syslog: "logstash.svc.eqiad.wmnet:10514"
+logstash_host: "logstash.svc.eqiad.wmnet"
+logstash_syslog_port: 10514
udp2log_aggregator: "udplog:8420"
tcpircbot_host: 'icinga.wikimedia.org'
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 0248906..973f755 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -141,7 +141,8 @@
rpc_address: '%{::ipaddress}'
# end cassandra
"udp2log_aggregator": deployment-fluorine02.deployment-prep.eqiad.wmflabs:8420
-"logstash_syslog": deployment-logstash2.deployment-prep.eqiad.wmflabs:10514
+"logstash_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
+"logstash_syslog_port": 10514
mediawiki_memcached_servers:
- 10.68.23.25:11211:1 # deployment-memc04
- 10.68.23.49:11211:1 # deployment-memc05
diff --git a/modules/profile/manifests/mediawiki/common.pp
b/modules/profile/manifests/mediawiki/common.pp
index 7731189..e63820f 100644
--- a/modules/profile/manifests/mediawiki/common.pp
+++ b/modules/profile/manifests/mediawiki/common.pp
@@ -1,5 +1,6 @@
class profile::mediawiki::common(
- $forward_syslog = hiera('logstash_syslog'),
+ $logstash_host = hiera('logstash_host'),
+ $logstash_syslog_port = hiera('logstash_syslog_port'),
$log_aggregator = hiera('udp2log_aggregator'),
){
@@ -8,7 +9,7 @@
}
class { '::mediawiki':
- forward_syslog => $forward_syslog,
+ forward_syslog => "${logstash_host}:${logstash_syslog_port}",
log_aggregator => $log_aggregator,
}
--
To view, visit https://gerrit.wikimedia.org/r/389483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I902d0083d64c8b9d67b0b013b218d8834281ec0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
