Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324371
Change subject: lvs: add logstash
......................................................................
lvs: add logstash
Note the TCP port used is log4j's, all other ports related to ingestion
protocols are UDP.
Bug: T151971
Change-Id: I2dc73a57dc96968cce9adaf7fe6b6b4e8a9eb65b
---
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/role/eqiad/kibana.yaml
4 files changed, 36 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/324371/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 97f94a7..cc9ba18 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -316,6 +316,6 @@
wdqs1001.eqiad.wmnet: [wdqs]
wdqs1002.eqiad.wmnet: [wdqs]
logstash:
- logstash1001.eqiad.wmnet: [kibana]
- logstash1002.eqiad.wmnet: [kibana]
- logstash1003.eqiad.wmnet: [kibana]
+ logstash1001.eqiad.wmnet: [kibana, logstash]
+ logstash1002.eqiad.wmnet: [kibana, logstash]
+ logstash1003.eqiad.wmnet: [kibana, logstash]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 0fca36d..0404d83 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -183,3 +183,10 @@
default_values:
pooled: 'no'
weight: 10
+ logstash:
+ port: 4560
+ datacenters:
+ - eqiad
+ default_values:
+ pooled: 'no'
+ weight: 10
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 8c07642..6298007 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -137,6 +137,8 @@
pdfrender: &ip_block034
eqiad: 10.2.2.35
codfw: 10.2.1.35
+ logstash: &ip_block035
+ eqiad: 10.2.2.36
lvs::configuration::lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -1102,3 +1104,26 @@
hostname: pdfrender.svc.eqiad.wmnet
codfw:
hostname: pdfrender.svc.codfw.wmnet
+ logstash:
+ description: Logstash ingestion
+ class: low-traffic
+ sites:
+ - eqiad
+ ip: *ip_block035
+ # TCP port (log4j)
+ port: 4560
+ bgp: 'yes'
+ depool-threshold: '.5'
+ scheduler: sh
+ monitors:
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: logstash
+ service: logstash
+ icinga:
+ check_command: "check_tcp_ip!logstash.svc.%{::site}.wmnet!4560"
+ sites:
+ eqiad:
+ hostname: logstash.svc.eqiad.wmnet
diff --git a/hieradata/role/eqiad/kibana.yaml b/hieradata/role/eqiad/kibana.yaml
index 42834ad..8ca61c9 100644
--- a/hieradata/role/eqiad/kibana.yaml
+++ b/hieradata/role/eqiad/kibana.yaml
@@ -1,2 +1,3 @@
lvs::realserver::realserver_ips:
- '10.2.2.33' # kibana.svc.eqiad.wmnet
+ - '10.2.2.36' # logstash.svc.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/324371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dc73a57dc96968cce9adaf7fe6b6b4e8a9eb65b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
