Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306672
Change subject: prometheus: add to LVS
......................................................................
prometheus: add to LVS
Also deploy service ip on prometheus eqiad/codfw
Bug: T126785
Change-Id: Ibf89504a06a69aca62af3f200d93dc4615e05023
---
M conftool-data/services/misc.yaml
M hieradata/common/lvs/configuration.yaml
A hieradata/role/codfw/prometheus/ops.yaml
A hieradata/role/eqiad/prometheus/ops.yaml
M modules/role/manifests/lvs/balancer.pp
M modules/role/manifests/prometheus/ops.pp
6 files changed, 46 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/306672/1
diff --git a/conftool-data/services/misc.yaml b/conftool-data/services/misc.yaml
index e533379..9ccfe81 100644
--- a/conftool-data/services/misc.yaml
+++ b/conftool-data/services/misc.yaml
@@ -17,3 +17,12 @@
"weight": 10
datacenters:
- eqiad
+prometheus:
+ prometheus:
+ port: 80
+ default_values:
+ "pooled": "no"
+ "weight": 10
+ datacenters:
+ - eqiad
+ - codfw
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index d87425f..c67c41f 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -126,6 +126,9 @@
thumbor: &ip_block029
eqiad: 10.2.2.24
codfw: 10.2.1.24
+ prometheus: &ip_block030
+ eqiad: 10.2.2.25
+ codfw: 10.2.1.25
lvs_services:
text:
description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org
(Varnish)"
@@ -955,3 +958,30 @@
sites:
eqiad:
hostname: thumbor.svc.eqiad.wmnet
+ prometheus:
+ description: Prometheus monitoring
+ class: low-traffic
+ sites:
+ - eqiad
+ - codfw
+ ip: *ip_block030
+ port: 80
+ bgp: 'yes'
+ depool-threshold: '.5'
+ monitors:
+ ProxyFetch:
+ url:
+ - http://localhost/
+ IdleConnection:
+ timeout-clean-reconnect: 3
+ max-delay: 300
+ conftool:
+ cluster: prometheus
+ service: prometheus
+ icinga:
+ check_command:
"check_http_lvs_on_port!prometheus.svc.%{::site}.wmnet!80!/"
+ sites:
+ eqiad:
+ hostname: prometheus.svc.eqiad.wmnet
+ codfw:
+ hostname: prometheus.svc.codfw.wmnet
diff --git a/hieradata/role/codfw/prometheus/ops.yaml
b/hieradata/role/codfw/prometheus/ops.yaml
new file mode 100644
index 0000000..4fd4e98
--- /dev/null
+++ b/hieradata/role/codfw/prometheus/ops.yaml
@@ -0,0 +1,2 @@
+lvs::realserver::realserver_ips:
+ - 10.2.1.25
diff --git a/hieradata/role/eqiad/prometheus/ops.yaml
b/hieradata/role/eqiad/prometheus/ops.yaml
new file mode 100644
index 0000000..b0b1342
--- /dev/null
+++ b/hieradata/role/eqiad/prometheus/ops.yaml
@@ -0,0 +1,2 @@
+lvs::realserver::realserver_ips:
+ - 10.2.2.25
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 50ae67d..e251e4a 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -42,6 +42,7 @@
$sip['apertium'][$::site],
$sip['ores'][$::site],
$sip['thumbor'][$::site],
+ $sip['prometheus'][$::site],
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
@@ -73,6 +74,7 @@
$sip['eventbus'][$::site],
$sip['ores'][$::site],
$sip['thumbor'][$::site],
+ $sip['prometheus'][$::site],
],
# esams + ulsfo
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index acaa1fb..2fc4185 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -1,5 +1,6 @@
class role::prometheus::ops {
include base::firewall
+ include lvs::realserver
$targets_path = '/srv/prometheus/ops/targets'
--
To view, visit https://gerrit.wikimedia.org/r/306672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf89504a06a69aca62af3f200d93dc4615e05023
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
