Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382210 )
Change subject: Revert "Add LVS service for druid-analytics-broker"
......................................................................
Revert "Add LVS service for druid-analytics-broker"
This reverts commit 36fc6b175b525a6262a40e5c3c9d7add3e5a4523.
Change-Id: I8b4c76c6af82cd9bc4a523b1b280e9a1d7bf0702
---
M conftool-data/discovery/services.yaml
M conftool-data/node/eqiad.yaml
M conftool-data/service/services.yaml
M hieradata/common/lvs/configuration.yaml
D hieradata/role/eqiad/druid/analytics/worker.yaml
5 files changed, 0 insertions(+), 40 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/conftool-data/discovery/services.yaml
b/conftool-data/discovery/services.yaml
index 3dba3a0..b2216ba 100644
--- a/conftool-data/discovery/services.yaml
+++ b/conftool-data/discovery/services.yaml
@@ -22,4 +22,3 @@
"recommendation-api": [eqiad, codfw]
wdqs: [eqiad, codfw]
zotero: [eqiad, codfw]
-druid-analytics-broker: [eqiad]
diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index caead4a..1d000d8 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -320,7 +320,3 @@
kubernetes:
argon.eqiad.wmnet: [kubemaster]
chlorine.eqiad.wmnet: [kubemaster]
- druid-analytics:
- druid1001.eqiad.wmnet: [druid-analytics-broker]
- druid1002.eqiad.wmnet: [druid-analytics-broker]
- druid1003.eqiad.wmnet: [druid-analytics-broker]
diff --git a/conftool-data/service/services.yaml
b/conftool-data/service/services.yaml
index f8e83f3..1934178 100644
--- a/conftool-data/service/services.yaml
+++ b/conftool-data/service/services.yaml
@@ -271,11 +271,3 @@
default_values:
pooled: 'no'
weight: 10
-druid-analytics:
- druid-analytics-broker:
- port: 8082
- datacenters:
- - eqiad
- default_values:
- pooled: 'yes'
- weight: 10
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 77dfc10..22fdb08 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -135,8 +135,6 @@
jobrunner: &ip_block039
eqiad: 10.2.2.26
codfw: 10.2.1.26
- druid-analytics: &ip_block040
- eqiad: 10.2.2.38
lvs::configuration::lvs_services:
text:
@@ -1364,26 +1362,3 @@
hostname: jobrunner.svc.eqiad.wmnet
codfw:
hostname: jobrunner.svc.codfw.wmnet
- druid-analytics-broker:
- description: Druid Analytics query broker (druid-analytics port 8082)
- class: low-traffic
- sites:
- - eqiad
- ip: *ip_block040
- port: 8082
- depool-threshold: '.5'
- conftool:
- cluster: druid-analytics
- service: druid-analytics-broker
- icinga:
- check_command:
"check_http_lvs_on_port!druid-analytics.svc.%{::site}.wmnet!8082!/status"
- sites:
- eqiad:
- hostname: druid-analytics.svc.eqiad.wmnet
- monitors:
- ProxyFetch:
- url:
- - http://localhost:8082/status
- IdleConnection:
- max-delay: 300
- timeout-clean-reconnect: 3
diff --git a/hieradata/role/eqiad/druid/analytics/worker.yaml
b/hieradata/role/eqiad/druid/analytics/worker.yaml
deleted file mode 100644
index 49678a1..0000000
--- a/hieradata/role/eqiad/druid/analytics/worker.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-lvs::realserver::realserver_ips:
- - '10.2.2.38' # druid-analytics.svc.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/382210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b4c76c6af82cd9bc4a523b1b280e9a1d7bf0702
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
