Mark Bergsma has submitted this change and it was merged.
Change subject: Remove old Ganglia groups
......................................................................
Remove old Ganglia groups
Change-Id: I2a80740df142365736a333b8c95ad3f5df92cf6f
---
M manifests/ganglia.pp
M modules/ganglia_new/manifests/configuration.pp
2 files changed, 5 insertions(+), 30 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 636ffe5..e9d950f 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -75,12 +75,6 @@
"mysql" => {
"name" => "MySQL",
"ip_oct" => "5" },
- "squids_upload" => {
- "name" => "Upload squids",
- "ip_oct" => "6" },
- "squids_text" => {
- "name" => "Text squids",
- "ip_oct" => "7" },
"misc" => {
"name" => "Miscellaneous",
"ip_oct" => "8" },
@@ -111,9 +105,6 @@
"bits_appserver" => {
"name" => "Bits application servers",
"ip_oct" => "24" },
- "squids_api" => {
- "name" => "API squids",
- "ip_oct" => "25" },
"ssl" => {
"name" => "SSL cluster",
"ip_oct" => "26" },
@@ -308,11 +299,8 @@
"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",
@@ -330,8 +318,6 @@
"Text squids eqiad" =>
"cp1001.eqiad.wmnet cp1002.eqiad.wmnet",
"Search eqiad" =>
"search1001.eqiad.wmnet search1002.eqiad.wmnet",
"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",
"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 analytics1010.eqiad.wmnet analytics1014.eqiad.wmnet",
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index 762e0ef..42f03c7 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -19,14 +19,6 @@
"mysql" => {
"name" => "MySQL",
"id" => 5 },
- "squids_upload" => {
- "name" => "Upload squids",
- "id" => 6,
- "sites" => ["pmtpa", "esams"] },
- "squids_text" => {
- "name" => "Text squids",
- "id" => 7,
- "sites" => ["pmtpa", "eqiad", "esams"] },
"misc" => {
"name" => "Miscellaneous",
"id" => 8,
@@ -46,35 +38,32 @@
"cache_text" => {
"name" => "Text caches",
"id" => 20,
- "sites" => ["pmtpa", "eqiad", "esams"] },
+ "sites" => ["eqiad", "esams"] },
"cache_bits" => {
"name" => "Bits caches",
"id" => 21,
- "sites" => ["pmtpa", "eqiad", "esams"] },
+ "sites" => ["eqiad", "esams"] },
"cache_upload" => {
"name" => "Upload caches",
"id" => 22,
- "sites" => ["pmtpa", "eqiad", "esams"] },
+ "sites" => ["eqiad", "esams"] },
"payments" => {
"name" => "Fundraiser payments",
"id" => 23 },
"bits_appserver" => {
"name" => "Bits application servers",
"id" => 24 },
- "squids_api" => {
- "name" => "API squids",
- "id" => 25 },
"ssl" => {
"name" => "SSL cluster",
"id" => 26,
- "sites" => ["pmtpa", "eqiad", "esams"] },
+ "sites" => ["eqiad", "esams"] },
"swift" => {
"name" => "Swift",
"id" => 27 },
"cache_mobile" => {
"name" => "Mobile caches",
"id" => 28,
- "sites" => ["pmtpa", "eqiad", "esams"] },
+ "sites" => ["eqiad", "esams"] },
"virt" => {
"name" => "Virtualization cluster",
"id" => 29 },
--
To view, visit https://gerrit.wikimedia.org/r/102424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a80740df142365736a333b8c95ad3f5df92cf6f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
