Ottomata has submitted this change and it was merged.
Change subject: ganglia.pp - assignment alignment
......................................................................
ganglia.pp - assignment alignment
Change-Id: I1c3cd4bb7b6d4145030452cf71c661f466f1a57a
---
M manifests/ganglia.pp
1 file changed, 59 insertions(+), 58 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index dd50335..8d85453 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -277,72 +277,73 @@
# neon runs gmetad for ganglios
/^neon$/: {
$data_sources = {
- "Miscellaneous" => "hooper.wikimedia.org
tarin.pmtpa.wmnet",
- "Miscellaneous eqiad" => "carbon.wikimedia.org
ms1004.eqiad.wmnet",
+ "Miscellaneous" => "hooper.wikimedia.org
tarin.pmtpa.wmnet",
+ "Miscellaneous eqiad" => "carbon.wikimedia.org
ms1004.eqiad.wmnet",
"Analytics cluster eqiad" =>
"analytics1009.eqiad.wmnet analytics1011.eqiad.wmnet",
}
$rra_sizes = '"RRA:AVERAGE:0.5:1:360"
"RRA:AVERAGE:0.5:24:245" "RRA:AVERAGE: 0.5:168:241"
"RRA:AVERAGE:0.5:672:241" "RRA:AVERAGE:0.5:5760:371"'
}
default: {
$data_sources = {
- "Decommissioned servers pmtpa" =>
"eiximenis.wikimedia.org",
- "Video scalers pmtpa" => "tmh1.pmtpa.wmnet
tmh2.pmtpa.wmnet",
- "Video scalers eqiad" => "tmh1001.eqiad.wmnet
tmh1002.eqiad.wmnet",
- "Image scalers pmtpa" => "mw75.pmtpa.wmnet
mw76.pmtpa.wmnet",
- "API application servers pmtpa" => "srv254.pmtpa.wmnet
srv255.pmtpa.wmnet",
- "Application servers pmtpa" => "srv258.pmtpa.wmnet
srv259.pmtpa.wmnet",
- "Jobrunners pmtpa" => "mw1.pmtpa.wmnet
mw2.pmtpa.wmnet",
- "Image scalers eqiad" => "mw1153.eqiad.wmnet
mw1154.eqiad.wmnet",
- "API application servers eqiad" => "mw1114.eqiad.wmnet
mw1115.eqiad.wmnet",
- "Application servers eqaid" => "mw1017.eqiad.wmnet
mw1018.eqiad.wmnet",
- "Jobrunners eqiad " => "mw1001.eqiad.wmnet
mw1002.eqiad.wmnet",
+ "Decommissioned servers pmtpa" =>
"eiximenis.wikimedia.org",
+ "Video scalers pmtpa" => "tmh1.pmtpa.wmnet
tmh2.pmtpa.wmnet",
+ "Video scalers eqiad" =>
"tmh1001.eqiad.wmnet tmh1002.eqiad.wmnet",
+ "Image scalers pmtpa" => "mw75.pmtpa.wmnet
mw76.pmtpa.wmnet",
+ "API application servers pmtpa" =>
"srv254.pmtpa.wmnet srv255.pmtpa.wmnet",
+ "Application servers pmtpa" =>
"srv258.pmtpa.wmnet srv259.pmtpa.wmnet",
+ "Jobrunners pmtpa" => "mw1.pmtpa.wmnet
mw2.pmtpa.wmnet",
+ "Image scalers eqiad" =>
"mw1153.eqiad.wmnet mw1154.eqiad.wmnet",
+ "API application servers eqiad" =>
"mw1114.eqiad.wmnet mw1115.eqiad.wmnet",
+ "Application servers eqaid" =>
"mw1017.eqiad.wmnet mw1018.eqiad.wmnet",
+ "Jobrunners eqiad " =>
"mw1001.eqiad.wmnet mw1002.eqiad.wmnet",
"Bits application servers pmtpa" =>
"srv248.pmtpa.wmnet srv249.pmtpa.wmnet",
"Bits application servers eqiad" =>
"mw1151.eqiad.wmnet mw1152.eqiad.wmnet",
- "Search pmtpa" => "search13.pmtpa.wmnet
search14.pmtpa.wmnet",
- "MySQL" => "db50.pmtpa.wmnet db51.pmtpa.wmnet",
- "PDF servers" => "pdf1.wikimedia.org
pdf2.wikimedia.org",
- "LVS loadbalancers pmtpa" => "lvs1.wikimedia.org
lvs2.wikimedia.org",
- "Miscellaneous" => "hooper.wikimedia.org
tarin.pmtpa.wmnet",
- "Text squids" => "sq59.wikimedia.org
sq60.wikimedia.org",
- "Bits caches pmtpa" => "manutius.wikimedia.org:8670
sq67.wikimedia.org sq68.wikimedia.org",
- "Fundraiser payments" => "payments1.wikimedia.org
payments2.wikimedia.org",
- "Fundraising eqiad" => "pay-lvs1001.frack.eqiad.wmnet
pay-lvs1002.frack.eqiad.wmnet",
- "SSL cluster" => "ssl1.wikimedia.org
ssl2.wikimedia.org",
- "SSL cluster esams" =>
"hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org
ssl3002.esams.wikimedia.org",
- "Swift pmtpa" => "ms-fe1.pmtpa.wmnet
ms-fe2.pmtpa.wmnet",
- "Virtualization cluster eqiad" =>
"virt1005.eqiad.wmnet virt1000.wikimedia.org",
- "Virtualization cluster pmtpa" => "virt5.pmtpa.wmnet
virt0.wikimedia.org",
- "Glusterfs cluster pmtpa" => "labstore1.pmtpa.wmnet
labstore2.pmtpa.wmnet",
- "MySQL eqiad" => "db1017.eqiad.wmnet
db1021.eqiad.wmnet",
- "LVS loadbalancers eqiad" => "lvs1001.wikimedia.org
lvs1002.wikimedia.org",
- "Miscellaneous eqiad" => "carbon.wikimedia.org
ms1004.eqiad.wmnet",
- "Mobile caches eqiad" => "cp1046.eqiad.wmnet
cp1047.eqiad.wmnet",
- "Mobile caches esams" =>
"hooft.esams.wikimedia.org:11677",
- "Bits caches eqiad" => "cp1056.eqiad.wmnet
cp1057.eqiad.wmnet",
- "Upload caches eqiad" => "cp1048.eqiad.wmnet
cp1049.eqiad.wmnet",
- "SSL cluster eqiad" => "ssl1001.wikimedia.org
ssl1002.wikimedia.org",
- "Swift eqiad" => "ms-fe1001.eqiad.wmnet
ms-fe1002.eqiad.wmnet",
- "Text squids eqiad" => "cp1001.eqiad.wmnet
cp1002.eqiad.wmnet",
- "Search eqiad" => "search1001.eqiad.wmnet
search1002.eqiad.wmnet",
- "Decommissioned servers esams" =>
"knsq1.esams.wikimedia.org",
- "Bits caches esams" =>
"hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org
cp3020.esams.wikimedia.org",
- "Text squids esams" =>
"hooft.esams.wikimedia.org:11656 amssq31.esams.wikimedia.org
amssq32.esams.wikimedia.org",
- "Upload squids esams" =>
"hooft.esams.wikimedia.org:11655 knsq16.esams.wikimedia.org
knsq17.esams.wikimedia.org",
- "LVS loadbalancers esams" =>
"hooft.esams.wikimedia.org:11651 amslvs1.esams.wikimedia.org
amslvs2.esams.wikimedia.org",
- "Miscellaneous esams" =>
"hooft.esams.wikimedia.org:11657",
- "Analytics cluster eqiad" =>
"analytics1009.eqiad.wmnet analytics1011.eqiad.wmnet",
- "Memcached pmtpa" => "mc1.pmtpa.wmnet mc2.pmtpa.wmnet",
- "Memcached eqiad" => "mc1001.eqiad.wmnet
mc1002.eqiad.wmnet",
- "Upload caches esams" =>
"hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org
cp3004.esams.wikimedia.org",
- "Ceph cluster esams" => "ms-be3001.esams.wikimedia.org
ms-be3002.esams.wikimedia.org",
- "Parsoid eqiad" => "wtp1001.eqiad.wmnet",
- "Parsoid Varnish eqiad" => "cp1045.eqiad.wmnet
cp1058.eqiad.wmnet",
- "Redis eqiad" => "rdb1001.eqiad.wmnet
rdb1002.eqiad.wmnet",
- "Labs NFS cluster pmtpa" => "labstore3.pmtpa.wmnet
labstore4.pmtpa.wmnet",
- "Text caches eqiad" => "cp1052.eqiad.wmnet
cp1053.eqiad.wmnet",
- 'Misc Web caches eqiad' => 'cp1043.eqiad.wmnet
cp1044.eqiad.wmnet',
- "LVS loadbalancers ulsfo" => "lvs4001.ulsfo.wmnet
lvs4003.ulsfo.wmnet",
- "Bits caches ulsfo" => 'cp4001.ulsfo.wmnet
cp4003.ulsfo.wmnet',
+ "Search pmtpa" =>
"search13.pmtpa.wmnet search14.pmtpa.wmnet",
+ "MySQL" => "db50.pmtpa.wmnet
db51.pmtpa.wmnet",
+ "PDF servers" =>
"pdf1.wikimedia.org pdf2.wikimedia.org",
+ "LVS loadbalancers pmtpa" =>
"lvs1.wikimedia.org lvs2.wikimedia.org",
+ "Miscellaneous" =>
"hooper.wikimedia.org tarin.pmtpa.wmnet",
+ "Text squids" =>
"sq59.wikimedia.org sq60.wikimedia.org",
+ "Bits caches pmtpa" =>
"manutius.wikimedia.org:8670 sq67.wikimedia.org sq68.wikimedia.org",
+ "Fundraiser payments" =>
"payments1.wikimedia.org payments2.wikimedia.org",
+ "Fundraising eqiad" =>
"pay-lvs1001.frack.eqiad.wmnet pay-lvs1002.frack.eqiad.wmnet",
+ "SSL cluster" =>
"ssl1.wikimedia.org ssl2.wikimedia.org",
+ "SSL cluster esams" =>
"hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org
ssl3002.esams.wikimedia.org",
+ "Swift pmtpa" =>
"ms-fe1.pmtpa.wmnet ms-fe2.pmtpa.wmnet",
+ "Virtualization cluster eqiad" =>
"virt1005.eqiad.wmnet virt1000.wikimedia.org",
+ "Virtualization cluster pmtpa" => "virt5.pmtpa.wmnet
virt0.wikimedia.org",
+ "Glusterfs cluster pmtpa" =>
"labstore1.pmtpa.wmnet labstore2.pmtpa.wmnet",
+ "MySQL eqiad" =>
"db1017.eqiad.wmnet db1021.eqiad.wmnet",
+ "LVS loadbalancers eqiad" =>
"lvs1001.wikimedia.org lvs1002.wikimedia.org",
+ "Miscellaneous eqiad" =>
"carbon.wikimedia.org ms1004.eqiad.wmnet",
+ "Mobile caches eqiad" =>
"cp1046.eqiad.wmnet cp1047.eqiad.wmnet",
+ "Mobile caches esams" =>
"hooft.esams.wikimedia.org:11677",
+ "Bits caches eqiad" =>
"cp1056.eqiad.wmnet cp1057.eqiad.wmnet",
+ "Upload caches eqiad" =>
"cp1048.eqiad.wmnet cp1049.eqiad.wmnet",
+ "SSL cluster eqiad" =>
"ssl1001.wikimedia.org ssl1002.wikimedia.org",
+ "Swift eqiad" =>
"ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet",
+ "Text squids eqiad" =>
"cp1001.eqiad.wmnet cp1002.eqiad.wmnet",
+ "Search eqiad" =>
"search1001.eqiad.wmnet search1002.eqiad.wmnet",
+ "Decommissioned servers esams" =>
"knsq1.esams.wikimedia.org",
+ "Bits caches esams" =>
"hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org
cp3020.esams.wikimedia.org",
+ "Text squids esams" =>
"hooft.esams.wikimedia.org:11656 amssq31.esams.wikimedia.org
amssq32.esams.wikimedia.org",
+ "Upload squids esams" =>
"hooft.esams.wikimedia.org:11655 knsq16.esams.wikimedia.org
knsq17.esams.wikimedia.org",
+ "LVS loadbalancers esams" =>
"hooft.esams.wikimedia.org:11651 amslvs1.esams.wikimedia.org
amslvs2.esams.wikimedia.org",
+ "Miscellaneous esams" =>
"hooft.esams.wikimedia.org:11657",
+ "Analytics cluster eqiad" =>
"analytics1009.eqiad.wmnet analytics1011.eqiad.wmnet",
+ "Memcached pmtpa" => "mc1.pmtpa.wmnet
mc2.pmtpa.wmnet",
+ "Memcached eqiad" =>
"mc1001.eqiad.wmnet mc1002.eqiad.wmnet",
+ "Upload caches esams" =>
"hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org
cp3004.esams.wikimedia.org",
+ "Ceph cluster esams" =>
"ms-be3001.esams.wikimedia.org ms-be3002.esams.wikimedia.org",
+ "Parsoid eqiad" =>
"wtp1001.eqiad.wmnet",
+ "Parsoid Varnish eqiad" =>
"cp1045.eqiad.wmnet cp1058.eqiad.wmnet",
+ "Redis eqiad" =>
"rdb1001.eqiad.wmnet rdb1002.eqiad.wmnet",
+ "Labs NFS cluster pmtpa" =>
"labstore3.pmtpa.wmnet labstore4.pmtpa.wmnet",
+ "Text caches eqiad" =>
"cp1052.eqiad.wmnet cp1053.eqiad.wmnet",
+ 'Misc Web caches eqiad' =>
'cp1043.eqiad.wmnet cp1044.eqiad.wmnet',
+ "LVS loadbalancers ulsfo" =>
"lvs4001.ulsfo.wmnet lvs4003.ulsfo.wmnet",
+ "Bits caches ulsfo" =>
'cp4001.ulsfo.wmnet cp4003.ulsfo.wmnet',
+
}
$rra_sizes = '"RRA:AVERAGE:0.5:1:360"
"RRA:AVERAGE:0.5:24:245" "RRA:AVERAGE:0.5:168:241" "RRA:AVERAGE:0.5:672:241"
"RRA:AVERAGE:0.5:5760:371"'
$rrd_rootdir = "/mnt/ganglia_tmp/rrds.pmtpa"
--
To view, visit https://gerrit.wikimedia.org/r/86686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c3cd4bb7b6d4145030452cf71c661f466f1a57a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
