Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364219 )
Change subject: Disable RCStream
......................................................................
Disable RCStream
Bug: T170157
Change-Id: I98e429a4c3b54bc2ebd9ef3fac9e679668d13568
---
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
M hieradata/common/role/deployment.yaml
M hieradata/role/common/cache/misc.yaml
D hieradata/role/common/rcstream.yaml
M manifests/site.pp
M modules/debdeploy/templates/debdeploy.erb
M modules/mw_rc_irc/templates/motd.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
9 files changed, 8 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/364219/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 32363be..7588ea0 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -206,11 +206,6 @@
id: 43
sites:
eqiad: []
- rcstream:
- description: "RCStream cluster"
- id: 44
- sites:
- eqiad: []
analytics_kafka:
description: "Analytics Kafka cluster"
id: 45
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 4eb09e3..87b2c35 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -174,10 +174,6 @@
parsoid_codfw:
description: codfw parsoid servers
-# RCStream
- rcstream_eqiad:
- description: eqiad rcstream
-
# RedisDB
redis_eqiad:
description: eqiad Redis
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 3111362..eda4a13 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -6,9 +6,6 @@
upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection
service_name: ocg
checkout_submodules: true
- rcstream/rcstream:
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/rcstream
- service_name: rcstream
fluoride/fluoride:
upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride
statsv/statsv:
diff --git a/hieradata/role/common/cache/misc.yaml
b/hieradata/role/common/cache/misc.yaml
index 8eeb773..b30239f 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -100,11 +100,6 @@
backends:
eqiad: 'puppetmaster1001.eqiad.wmnet'
codfw: 'puppetmaster2001.codfw.wmnet'
- rcstream:
- be_opts:
- max_connections: 1000
- backends:
- eqiad: 'rcs1001.eqiad.wmnet'
ruthenium:
be_opts:
port: 8001
@@ -253,9 +248,6 @@
'^/v2/stream/.+':
director: 'eventstreams'
caching: 'pipe'
- '^/(socket\.io|rc(stream_status)?)(/|$)':
- director: 'rcstream'
- caching: 'websockets'
ticket.wikimedia.org:
director: 'mendelevium'
caching: 'pass'
diff --git a/hieradata/role/common/rcstream.yaml
b/hieradata/role/common/rcstream.yaml
deleted file mode 100644
index b50476a..0000000
--- a/hieradata/role/common/rcstream.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-cluster: rcstream
-debdeploy::grains:
- debdeploy-rcstream:
- value: standard
diff --git a/manifests/site.pp b/manifests/site.pp
index 6a80851..3334325 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1923,11 +1923,10 @@
interface::add_ip6_mapped { 'main': }
}
-# Live Recent Changes WebSocket stream
+# Live Recent Changes WebSocket stream # Decommed: T156919
node 'rcs1001.eqiad.wmnet', 'rcs1002.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
- role(rcstream)
- include ::base::firewall
+ role(spare::system)
}
diff --git a/modules/debdeploy/templates/debdeploy.erb
b/modules/debdeploy/templates/debdeploy.erb
index a120c49..83cd806 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -12,7 +12,7 @@
misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard,
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard,
debdeploy-impala:standard, debdeploy-spark-worker:standard,
debdeploy-stat:standard, debdeploy-stat:canary, debdeploy-notebook:standard,
debdeploy-druid:standard, debdeploy-analytics-web:standard
all-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard,
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard,
debdeploy-impala:standard, debdeploy-spark-worker:standard,
debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard,
debdeploy-hadoop-standby:standard, debdeploy-hadoop-worker:canary
misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard,
debdeploy-labtest:standard, debdeploy-sectools:standard
-misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard,
debdeploy-releases:standard, debdeploy-ve:standard, debdeploy-irc:standard,
debdeploy-phabricator:standard, debdeploy-gerrit:standard,
debdeploy-archiva:standard, debdeploy-rcstream:standard,
debdeploy-eventlogging:standard, debdeploy-deployment:standard,
debdeploy-piwik:standard, debdeploy-zuulmerger:standard,
debdeploy-debugproxy:standard, debdeploy-webperf:standard,
debdeploy-oresrdb:standard
+misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard,
debdeploy-releases:standard, debdeploy-ve:standard, debdeploy-irc:standard,
debdeploy-phabricator:standard, debdeploy-gerrit:standard,
debdeploy-archiva:standard, debdeploy-eventlogging:standard,
debdeploy-deployment:standard, debdeploy-piwik:standard,
debdeploy-zuulmerger:standard, debdeploy-debugproxy:standard,
debdeploy-webperf:standard, debdeploy-oresrdb:standard
misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard,
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard,
debdeploy-installserver:standard, debdeploy-librenms:standard,
debdeploy-backup-storage:standard, debdeploy-tftpserver:standard,
debdeploy-saltmaster:standard, debdeploy-urldownloader:standard,
debdeploy-rt:standard
deployment-servers = debdeploy-deployment:standard
hadoop-worker = debdeploy-hadoop-worker:standard,
debdeploy-hadoop-worker:canary
@@ -95,7 +95,6 @@
swift-be-esams = debdeploy-swift-be-esams:standard
swift-be = debdeploy-swift-be-eqiad:standard,
debdeploy-swift-be-codfw:standard, debdeploy-swift-be-esams:standard,
debdeploy-swift-be-eqiad:canary
swift-be-canary = debdeploy-swift-be-eqiad:canary
-rcstream = debdeploy-rcstream:standard
puppetmaster-backend = debdeploy-puppetmaster-backend:standard
puppetmaster-frontend = debdeploy-puppetmaster-frontend:standard
puppetmaster = debdeploy-puppetmaster-backend:standard,
debdeploy-puppetmaster-frontend:standard
diff --git a/modules/mw_rc_irc/templates/motd.erb
b/modules/mw_rc_irc/templates/motd.erb
index 0cbb4fa..d36db0e 100644
--- a/modules/mw_rc_irc/templates/motd.erb
+++ b/modules/mw_rc_irc/templates/motd.erb
@@ -14,6 +14,6 @@
If you want to talk, please join one of the many
Wikimedia-related channels on irc.freenode.net.
-Alternatively, you can use Wikimedia's RCStream service,
-which streams recent changes as JSON using the WebSockets protocol.
-See https://wikitech.wikimedia.org/wiki/RCStream for details.
+Alternatively, you can use Wikimedia's EventStreams service,
+which streams recent changes as JSON using the SSE protocol.
+See https://wikitech.wikimedia.org/wiki/EventStreams for details.
diff --git a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
index a386448..44f2a41 100644
--- a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
@@ -21,13 +21,8 @@
// This is all of our unified cert wildcard domains,
// as well as matching beta.wmflabs.org names handled
via LE.
if (req.http.Host ~
"((^|\.)(wikipedia|wikimedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki|wmfusercontent)(\.beta\.wmflabs)?\.org|^w\.wiki|^upload\.beta\.wmflabs\.org)$")
{
- if (req.http.Host == "stream.wikimedia.org" &&
req.url ~ "^/(socket\.io|rc(stream_status)?)(/|$)") {
- // NO-OP, temporary hole-punch for
legacy redirect-incompatible rcstream clients
- }
- else {
- set req.http.Location = "https://"; +
req.http.Host + req.url;
- return (synth(301, "TLS Redirect"));
- }
+ set req.http.Location = "https://"; +
req.http.Host + req.url;
+ return (synth(301, "TLS Redirect"));
}
}
else {
--
To view, visit https://gerrit.wikimedia.org/r/364219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98e429a4c3b54bc2ebd9ef3fac9e679668d13568
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
