Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399629 )
Change subject: kafkatee: use the canonical definition of logstash host
......................................................................
kafkatee: use the canonical definition of logstash host
Bug: T182304
Change-Id: Iaee3be3b2aa3de99bd2448da9f11106683f7cbca
---
M hieradata/common.yaml
D hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
M modules/role/manifests/logging/kafkatee/webrequest/ops.pp
3 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
Gehel: Looks good to me, approved
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4ff228a..f55e552 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -520,6 +520,7 @@
logstash_host: "logstash.svc.eqiad.wmnet"
logstash_syslog_port: 10514
logstash_gelf_port: 12201
+logstash_json_lines_port: 11514
udp2log_aggregator: "udplog:8420"
tcpircbot_host: 'icinga.wikimedia.org'
diff --git a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
deleted file mode 100644
index 7d7a879..0000000
--- a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-role::logging::kafkatee::webrequest::ops::logstash_host:
logstash.svc.eqiad.wmnet
-role::logging::kafkatee::webrequest::ops::logstash_port: 11514
diff --git a/modules/role/manifests/logging/kafkatee/webrequest/ops.pp
b/modules/role/manifests/logging/kafkatee/webrequest/ops.pp
index 67b43e1..14393dd 100644
--- a/modules/role/manifests/logging/kafkatee/webrequest/ops.pp
+++ b/modules/role/manifests/logging/kafkatee/webrequest/ops.pp
@@ -8,8 +8,8 @@
include ::geoip # lint:ignore:wmf_styleguide
$webrequest_log_directory =
$::role::logging::kafkatee::webrequest::base::webrequest_log_directory
- $logstash_host =
hiera('role::logging::kafkatee::webrequest::ops::logstash_host')
- $logstash_port =
hiera('role::logging::kafkatee::webrequest::ops::logstash_port')
+ $logstash_host = hiera('logstash_host')
+ $logstash_port = hiera('logstash_json_lines_port')
kafkatee::output { 'sampled-1000':
destination => "${webrequest_log_directory}/sampled-1000.json",
--
To view, visit https://gerrit.wikimedia.org/r/399629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaee3be3b2aa3de99bd2448da9f11106683f7cbca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
