[MediaWiki-commits] [Gerrit] Alphabetise site.pp - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Alphabetise site.pp
..
Alphabetise site.pp
A lot of site.pp are not correctly ordered which is annoying when finding a
service
and it is at the bottom or in the middle of another set of letters about 10
sets down.
Change-Id: I0d5cb662df73355a386defb66d170def7e43400c
---
M manifests/site.pp
1 file changed, 279 insertions(+), 283 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Gage: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 41539c5..6b7b640 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -125,9 +125,6 @@
include role::analytics::hadoop::standby
}
-
-
-
# analytics1004 was previously the Hadoop standby NameNode
# It is being deprecated.
node 'analytics1004.eqiad.wmnet' {
@@ -371,6 +368,14 @@
role ipsec
}
+# http://releases.wikimedia.org
+node 'caesium.eqiad.wmnet' {
+role releases
+include base::firewall
+include admin
+include standard
+}
+
# T83044 cameras
node 'calcium.wikimedia.org' {
$cluster = 'misc'
@@ -379,6 +384,16 @@
include standard
include base::firewall
+}
+
+# Californium hosts openstack-dashboard AKA horizon
+# It's proxied by the misc-web varnishes
+node 'californium.wikimedia.org' {
+include standard
+include admin
+include role::horizon
+
+class { 'base::firewall': }
}
# DHCP / TFTP
@@ -393,14 +408,6 @@
include admin
include standard
include role::installserver
-}
-
-# http://releases.wikimedia.org
-node 'caesium.eqiad.wmnet' {
-role releases
-include base::firewall
-include admin
-include standard
}
# cerium, praseodymium and xenon are Cassandra test hosts
@@ -565,21 +572,22 @@
}
# eqiad dbs
-node /^db10(52)\.eqiad\.wmnet/ {
-
-include admin
-$cluster = 'mysql'
-class { 'role::coredb::s1':
-innodb_file_per_table => true,
-mariadb => true,
-}
-}
node /^db10(18)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::coredb::s2':
+innodb_file_per_table => true,
+mariadb => true,
+}
+}
+
+node /^db10(52)\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::coredb::s1':
innodb_file_per_table => true,
mariadb => true,
}
@@ -909,6 +917,13 @@
}
}
+node 'dbstore1002.eqiad.wmnet' {
+include admin
+$cluster = 'mysql'
+$ganglia_aggregator = true
+include role::mariadb::dbstore
+}
+
node 'dbstore2001.codfw.wmnet' {
include admin
$cluster = 'mysql'
@@ -920,13 +935,6 @@
# don't spam Icinga with warnings. This will not block properly
critical alerts.
warn_stopped => false,
}
-}
-
-node 'dbstore1002.eqiad.wmnet' {
-include admin
-$cluster = 'mysql'
-$ganglia_aggregator = true
-include role::mariadb::dbstore
}
node 'dbstore2002.codfw.wmnet' {
@@ -1003,6 +1011,14 @@
system::role { 'Titan test host': }
}
+node /^elastic10[0-3][0-9]\.eqiad\.wmnet/ {
+if $::hostname =~ /^elastic10(0[17]|13)/ {
+$ganglia_aggregator = true
+}
+
+role elasticsearch::server
+}
+
# erbium is a webrequest udp2log host
node 'erbium.eqiad.wmnet' inherits 'base_analytics_logging_node' {
# gadolinium hosts the separate nginx webrequest udp2log instance.
@@ -1030,12 +1046,12 @@
}
}
-node /es200[1234]\.codfw\.wmnet/ {
+node /es100[5]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::mariadb::core':
-shard => 'es1',
+shard => 'es2',
}
}
@@ -1047,12 +1063,12 @@
}
}
-node /es100[5]\.eqiad\.wmnet/ {
+node /es200[1234]\.codfw\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::mariadb::core':
-shard => 'es2',
+shard => 'es1',
}
}
@@ -1091,6 +1107,16 @@
}
}
+# Receives log data from varnishes (udp 8422) and Apaches (udp 8421),
+# processes it, and broadcasts to internal subscribers.
+node 'eventlog1001.eqiad.wmnet' {
+role eventlogging
+include admin
+include standard
+include role::ipython_notebook
+include role::logging::mediawiki::errors
+}
+
node 'fluorine.eqiad.wmnet' {
$cluster = 'misc'
@@ -1115,15 +1141,6 @@
# relay EventLogging traffic over to eventlog1001
include role::logging::relay::eventlogging
}
-
-
-# protactinium was being used as an emergency gadolinium replacement.
-# Since gadolinium is back up, varnishncsa instances now send logs
-# to gadolinium again. protactinium is not being used.
-node 'protactinium.wikimedia.org' {
-include admin
-}
-
node 'gallium.wikimedia.org' {
@@ -1171,6 +1188,16 @@
include standard
}
+# Hosts visualization / monitoring of EventLogging event streams
+# and
[MediaWiki-commits] [Gerrit] alphabetise site.pp - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201850
Change subject: alphabetise site.pp
..
alphabetise site.pp
A lot of site.pp are not correctly
ordered which is annoying when finding
a service and it is at the bottom
or in the middle of another set
of letters about 10 sets down.
Change-Id: I0d5cb662df73355a386defb66d170def7e43400c
---
M manifests/site.pp
1 file changed, 270 insertions(+), 284 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/201850/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 41539c5..f0394ce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -125,9 +125,6 @@
include role::analytics::hadoop::standby
}
-
-
-
# analytics1004 was previously the Hadoop standby NameNode
# It is being deprecated.
node 'analytics1004.eqiad.wmnet' {
@@ -371,6 +368,14 @@
role ipsec
}
+# http://releases.wikimedia.org
+node 'caesium.eqiad.wmnet' {
+role releases
+include base::firewall
+include admin
+include standard
+}
+
# T83044 cameras
node 'calcium.wikimedia.org' {
$cluster = 'misc'
@@ -379,6 +384,16 @@
include standard
include base::firewall
+}
+
+# Californium hosts openstack-dashboard AKA horizon
+# It's proxied by the misc-web varnishes
+node 'californium.wikimedia.org' {
+include standard
+include admin
+include role::horizon
+
+class { 'base::firewall': }
}
# DHCP / TFTP
@@ -393,14 +408,6 @@
include admin
include standard
include role::installserver
-}
-
-# http://releases.wikimedia.org
-node 'caesium.eqiad.wmnet' {
-role releases
-include base::firewall
-include admin
-include standard
}
# cerium, praseodymium and xenon are Cassandra test hosts
@@ -565,21 +572,12 @@
}
# eqiad dbs
+
node /^db10(52)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::coredb::s1':
-innodb_file_per_table => true,
-mariadb => true,
-}
-}
-
-node /^db10(18)\.eqiad\.wmnet/ {
-
-include admin
-$cluster = 'mysql'
-class { 'role::coredb::s2':
innodb_file_per_table => true,
mariadb => true,
}
@@ -909,6 +907,13 @@
}
}
+node 'dbstore1002.eqiad.wmnet' {
+include admin
+$cluster = 'mysql'
+$ganglia_aggregator = true
+include role::mariadb::dbstore
+}
+
node 'dbstore2001.codfw.wmnet' {
include admin
$cluster = 'mysql'
@@ -920,13 +925,6 @@
# don't spam Icinga with warnings. This will not block properly
critical alerts.
warn_stopped => false,
}
-}
-
-node 'dbstore1002.eqiad.wmnet' {
-include admin
-$cluster = 'mysql'
-$ganglia_aggregator = true
-include role::mariadb::dbstore
}
node 'dbstore2002.codfw.wmnet' {
@@ -1003,6 +1001,14 @@
system::role { 'Titan test host': }
}
+node /^elastic10[0-3][0-9]\.eqiad\.wmnet/ {
+if $::hostname =~ /^elastic10(0[17]|13)/ {
+$ganglia_aggregator = true
+}
+
+role elasticsearch::server
+}
+
# erbium is a webrequest udp2log host
node 'erbium.eqiad.wmnet' inherits 'base_analytics_logging_node' {
# gadolinium hosts the separate nginx webrequest udp2log instance.
@@ -1030,12 +1036,12 @@
}
}
-node /es200[1234]\.codfw\.wmnet/ {
+node /es100[5]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::mariadb::core':
-shard => 'es1',
+shard => 'es2',
}
}
@@ -1047,12 +1053,12 @@
}
}
-node /es100[5]\.eqiad\.wmnet/ {
+node /es200[1234]\.codfw\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::mariadb::core':
-shard => 'es2',
+shard => 'es1',
}
}
@@ -1091,6 +1097,16 @@
}
}
+# Receives log data from varnishes (udp 8422) and Apaches (udp 8421),
+# processes it, and broadcasts to internal subscribers.
+node 'eventlog1001.eqiad.wmnet' {
+role eventlogging
+include admin
+include standard
+include role::ipython_notebook
+include role::logging::mediawiki::errors
+}
+
node 'fluorine.eqiad.wmnet' {
$cluster = 'misc'
@@ -1115,15 +1131,6 @@
# relay EventLogging traffic over to eventlog1001
include role::logging::relay::eventlogging
}
-
-
-# protactinium was being used as an emergency gadolinium replacement.
-# Since gadolinium is back up, varnishncsa instances now send logs
-# to gadolinium again. protactinium is not being used.
-node 'protactinium.wikimedia.org' {
-include admin
-}
-
node 'gallium.wikimedia.org' {
@@ -1171,6 +1178,16 @@
include standard
}
+# Hosts visualization / monitoring of EventLogging event streams
+# and MediaWiki errors.
+node 'hafnium.wikimedia.org' {
+role eventlogging::graphite
+include standard
+include admin
+include base::firewall
+include role::webperf
+}
+
node 'helium.eqiad.wmnet' {
