Faidon Liambotis has submitted this change and it was merged.
Change subject: Rename "statsdlb" role to "statsd"
......................................................................
Rename "statsdlb" role to "statsd"
The role class sets up statsdlb, but also statsite and the diamond
UDPCollector. It's clearly the role we call "statsd" internally, with
its contents being implementation details. Also rename the ferm service,
for the same reason.
Change-Id: Ic835c59cdc7f99d8397555c8c5c7cdf4eb07d870
---
R manifests/role/statsd.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/statsdlb.pp b/manifests/role/statsd.pp
similarity index 95%
rename from manifests/role/statsdlb.pp
rename to manifests/role/statsd.pp
index 064da19..349e121 100644
--- a/manifests/role/statsdlb.pp
+++ b/manifests/role/statsd.pp
@@ -1,10 +1,10 @@
-# == Class: role::statsdlb
+# == Class: role::statsd
#
# Provisions a statsdlb instance that listens for StatsD metrics on
# on UDP port 8125 and forwards to backends on UDP ports 8126+,
# as well as the set of statsite backends that listen on these ports.
#
-class role::statsdlb {
+class role::statsd {
# statsdlb
@@ -14,7 +14,7 @@
}
# load balancer frontend, backend ports 8126-8131 are only accessed from
localhost
- ferm::service { 'statsdlb':
+ ferm::service { 'statsd':
proto => 'udp',
port => '8125',
notrack => true,
diff --git a/manifests/site.pp b/manifests/site.pp
index 2318ad5..9134724 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1180,7 +1180,7 @@
# Primary graphite machines
node 'graphite1001.eqiad.wmnet' {
- role graphite::production, statsdlb, performance, graphite::alerts,
restbase::alerts, graphite::alerts::reqstats, elasticsearch::alerts
+ role graphite::production, statsd, performance, graphite::alerts,
restbase::alerts, graphite::alerts::reqstats, elasticsearch::alerts
include standard
include base::firewall
}
@@ -1193,7 +1193,7 @@
# Primary graphite machines
node 'graphite2001.codfw.wmnet' {
- role graphite::production, statsdlb
+ role graphite::production, statsd
include standard
include base::firewall
}
--
To view, visit https://gerrit.wikimedia.org/r/282355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic835c59cdc7f99d8397555c8c5c7cdf4eb07d870
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
