BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223184
Change subject: beta: Replace deployment-logstash1 with deployment-logstash2
......................................................................
beta: Replace deployment-logstash1 with deployment-logstash2
Bug: T101541
Change-Id: Iffc3e62439d6bbccf7f5e215c1bfb56eab6f33c0
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/restbase/common.yaml
M manifests/role/beta.pp
M manifests/role/logging.pp
M modules/base/manifests/remote_syslog.pp
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/223184/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index cc9e801..81b95a2 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -1,16 +1,16 @@
---
base::remote_syslog::enable: true
-base::remote_syslog::central_host: "deployment-logstash1.eqiad.wmflabs:10514"
+base::remote_syslog::central_host:
"deployment-logstash2.deployment-prep.eqiad.wmflabs:10514"
"ocg::temp_dir": /mnt/tmpfs
"ocg::redis_host": deployment-redis01.eqiad.wmflabs
"ocg::statsd_host": labmon1001.eqiad.wmnet
-"ocg::graylog_host": deployment-logstash1.eqiad.wmflabs
+"ocg::graylog_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
"ocg::redis_password": '%{::passwords::redis::main_password}'
has_lvs: false
"puppetmaster::scripts::keep_reports_minutes": 360
#service::configuration::http_proxy:
service::configuration::statsd_host: labmon1001.eqiad.wmnet
-service::configuration::logstash_host:
deployment-logstash1.deployment-prep.eqiad.wmflabs
+service::configuration::logstash_host:
deployment-logstash2.deployment-prep.eqiad.wmflabs
citoid::zotero_host: deployment-zotero01.deployment-prep.eqiad.wmflabs
citoid::zotero_port: 1969
graphoid::domains:
@@ -66,11 +66,11 @@
"restbase::config_template": restbase/config.labs.yaml.erb
"restbase::parsoid_uri":
http://deployment-parsoid05.deployment-prep.eqiad.wmflabs:8000
"restbase::statsd_host": labmon1001.eqiad.wmnet
-"restbase::logstash_host": deployment-logstash1.deployment-prep.eqiad.wmflabs
+"restbase::logstash_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
"restbase::cassandra_defaultConsistency": localQuorum
restbase::graphoid_host_port:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
"mediawiki::log_aggregator": deployment-fluorine.eqiad.wmflabs:8420
-"mediawiki::forward_syslog": deployment-logstash1.eqiad.wmflabs:10514
+"mediawiki::forward_syslog":
deployment-logstash2.deployment-prep.eqiad.wmflabs:10514
mediawiki_memcached_servers:
- 10.68.16.14:11211:1
- 10.68.16.15:11211:1
@@ -87,7 +87,7 @@
"role::cxserver::cxserver_port": 8080
"misc::syslog-server::basepath": /data/project/syslog
"cxserver::log_dir": /var/log/cxserver
-"cxserver::logstash_host": deployment-logstash1.deployment-prep.eqiad.wmflabs
+"cxserver::logstash_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
"cxserver::apertium": http://apertium-beta.wmflabs.org
"cxserver::proxy":
http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
"cxserver::yandex_url": 'https://translate.yandex.net'
diff --git a/hieradata/labs/restbase/common.yaml
b/hieradata/labs/restbase/common.yaml
index 7c69d4a..e66265f 100644
--- a/hieradata/labs/restbase/common.yaml
+++ b/hieradata/labs/restbase/common.yaml
@@ -1,4 +1,4 @@
seeds:
- "localhost"
logstash_port: 12201
-logstash_host: "deployment-logstash1.eqiad.wmflabs"
+logstash_host: "deployment-logstash2.deployment-prep.eqiad.wmflabs"
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 8ff5b39..acfd21e 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -43,7 +43,7 @@
# Add nice things to the beta puppetmaster.
class role::beta::puppetmaster {
class { 'puppetmaster::logstash':
- logstash_host => 'deployment-logstash1.eqiad.wmflabs',
+ logstash_host => 'deployment-logstash2.deployment-prep.eqiad.wmflabs',
logstash_port => 5229,
}
}
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 332a6f7..a300910 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -66,7 +66,7 @@
# TODO: Find a way to use multicast that doesn't cause duplicate
# messages to be stored in logstash. This is a SPOF.
production => 'logstash1001.eqiad.wmnet',
- labs => 'deployment-logstash1.eqiad.wmflabs',
+ labs => 'deployment-logstash2.deployment-prep.eqiad.wmflabs',
}
$logstash_port = 8324
diff --git a/modules/base/manifests/remote_syslog.pp
b/modules/base/manifests/remote_syslog.pp
index b3f6ff8..587f8d4 100644
--- a/modules/base/manifests/remote_syslog.pp
+++ b/modules/base/manifests/remote_syslog.pp
@@ -9,7 +9,7 @@
#
# [*central_host*]
# Host (and optional port) to forward syslog events to.
-# (e.g. "syslog.eqiad.wmnet" or "deployment-logstash1.eqiad.wmflabs:10514")
+# (e.g. "syslog.eqiad.wmnet" or
"deployment-logstash2.deployment-prep.eqiad.wmflabs:10514")
#
#
class base::remote_syslog (
--
To view, visit https://gerrit.wikimedia.org/r/223184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffc3e62439d6bbccf7f5e215c1bfb56eab6f33c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
