Gehel has uploaded a new change for review. https://gerrit.wikimedia.org/r/316774
Change subject: kibana - move to an LVS service ...................................................................... kibana - move to an LVS service Configure LVS for kibana. Another change will contain the modification to cache configuration to actually start using this LVS service. Bug: T132458 Change-Id: I03341d10889947b336f4921c28b753c40221da0e --- M conftool-data/nodes/eqiad.yaml M conftool-data/services/services.yaml M hieradata/common/lvs/configuration.yaml A hieradata/role/eqiad/kibana.yaml M manifests/site.pp M modules/role/manifests/lvs/balancer.pp 6 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/74/316774/1 diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml index 00a4ef2..d8c94a7 100644 --- a/conftool-data/nodes/eqiad.yaml +++ b/conftool-data/nodes/eqiad.yaml @@ -314,3 +314,7 @@ wdqs: wdqs1001.eqiad.wmnet: [wdqs] wdqs1002.eqiad.wmnet: [wdqs] +logstash: + logstash1001.eqiad.wmnet: [kibana] + logstash1002.eqiad.wmnet: [kibana] + logstash1003.eqiad.wmnet: [kibana] diff --git a/conftool-data/services/services.yaml b/conftool-data/services/services.yaml index 27e5c22..d6ad545 100644 --- a/conftool-data/services/services.yaml +++ b/conftool-data/services/services.yaml @@ -159,3 +159,11 @@ default_values: pooled: 'no' weight: 10 +logstash: + kibana: + port: 80 + datacenters: + - eqiad + default_values: + pooled: 'no' + weight: 10 diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index 20560fa..913f4c8 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -129,6 +129,8 @@ wdqs: &ip_block031 eqiad: 10.2.2.32 codfw: 10.2.1.32 + kibana: &ip_block032 + eqiad: 10.2.2.33 lvs::configuration::lvs_services: text: description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org (Varnish)" @@ -1015,3 +1017,22 @@ hostname: wdqs.svc.eqiad.wmnet codfw: hostname: wdqs.svc.codfw.wmnet + kibana: + description: Kibana + class: low-traffic + sites: + - eqiad + ip: *ip_block032 + port: 80 + bgp: 'yes' + depool-threshold: '.5' + monitors: + ProxyFetch: + url: + - http://localhost/api/status + IdleConnection: + timeout-clean-reconnect: 3 + max-delay: 300 + conftool: + cluster: logstash + service: kibana diff --git a/hieradata/role/eqiad/kibana.yaml b/hieradata/role/eqiad/kibana.yaml new file mode 100644 index 0000000..42834ad --- /dev/null +++ b/hieradata/role/eqiad/kibana.yaml @@ -0,0 +1,2 @@ +lvs::realserver::realserver_ips: + - '10.2.2.33' # kibana.svc.eqiad.wmnet diff --git a/manifests/site.pp b/manifests/site.pp index c9527f3..814cfab 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1529,10 +1529,12 @@ node /^logstash100[1-2]\.eqiad\.wmnet$/ { role(logstash, kibana, logstash::apifeatureusage) + include ::lvs::realserver } node /^logstash1003\.eqiad\.wmnet$/ { role(logstash, kibana, logstash::apifeatureusage, logstash::eventlogging) + include ::lvs::realserver } node /^logstash100[4-6]\.eqiad\.wmnet$/ { role(logstash::elasticsearch) diff --git a/modules/role/manifests/lvs/balancer.pp b/modules/role/manifests/lvs/balancer.pp index 1af8fcc..4f7f01d 100644 --- a/modules/role/manifests/lvs/balancer.pp +++ b/modules/role/manifests/lvs/balancer.pp @@ -45,6 +45,7 @@ $sip['thumbor'][$::site], $sip['prometheus'][$::site], $sip['wdqs'][$::site], + $sip['kibana'][$::site], ], # codfw (should mirror eqiad above, eventually, and become merged with it via regex -- To view, visit https://gerrit.wikimedia.org/r/316774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03341d10889947b336f4921c28b753c40221da0e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <gleder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits