Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383098 )

Change subject: maps: all log producers need to use the logstash LVS endpoint
......................................................................


maps: all log producers need to use the logstash LVS endpoint

Remove the maps specific configuration of logstash / statsd endpoint. There
is no reason not to use the globally configured ones.

Bug: T175242
Change-Id: I7b32e44e80f434662e91351ea721d4b6fbd62de5
---
M hieradata/role/common/maps/master.yaml
M hieradata/role/common/maps/slave.yaml
M hieradata/role/common/maps/test/master.yaml
M hieradata/role/common/maps/test/slave.yaml
4 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/hieradata/role/common/maps/master.yaml 
b/hieradata/role/common/maps/master.yaml
index 29ff9ed..b8e28e8 100644
--- a/hieradata/role/common/maps/master.yaml
+++ b/hieradata/role/common/maps/master.yaml
@@ -21,8 +21,6 @@
 cluster: 'maps'
 
 profile::cassandra::single_instance::graphite_host: 'graphite-in.eqiad.wmnet'
-service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
-service::configuration::statsd_host: 'statsd.eqiad.wmnet'
 
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$
diff --git a/hieradata/role/common/maps/slave.yaml 
b/hieradata/role/common/maps/slave.yaml
index 8706de2..010758d 100644
--- a/hieradata/role/common/maps/slave.yaml
+++ b/hieradata/role/common/maps/slave.yaml
@@ -21,8 +21,6 @@
 cluster: 'maps'
 
 profile::cassandra::single_instance::graphite_host: 'graphite-in.eqiad.wmnet'
-service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
-service::configuration::statsd_host: 'statsd.eqiad.wmnet'
 
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$
diff --git a/hieradata/role/common/maps/test/master.yaml 
b/hieradata/role/common/maps/test/master.yaml
index bc4a6cc..6cf990b 100644
--- a/hieradata/role/common/maps/test/master.yaml
+++ b/hieradata/role/common/maps/test/master.yaml
@@ -18,8 +18,6 @@
 cluster: 'maps-test'
 
 profile::cassandra::single_instance::graphite_host: 'graphite-in.eqiad.wmnet'
-service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
-service::configuration::statsd_host: 'statsd.eqiad.wmnet'
 
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$
diff --git a/hieradata/role/common/maps/test/slave.yaml 
b/hieradata/role/common/maps/test/slave.yaml
index fecc8a9..4cd555b 100644
--- a/hieradata/role/common/maps/test/slave.yaml
+++ b/hieradata/role/common/maps/test/slave.yaml
@@ -18,8 +18,6 @@
 cluster: 'maps-test'
 
 profile::cassandra::single_instance::graphite_host: 'graphite-in.eqiad.wmnet'
-service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
-service::configuration::statsd_host: 'statsd.eqiad.wmnet'
 
 cassandra::metrics::blacklist:
   - .*\.metrics\.Table\..*$

-- 
To view, visit https://gerrit.wikimedia.org/r/383098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b32e44e80f434662e91351ea721d4b6fbd62de5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to