Mark Bergsma has submitted this change and it was merged.
Change subject: Add Misc Web caching Ganglia cluster
......................................................................
Add Misc Web caching Ganglia cluster
Change-Id: I4eb1b68aa3fbdaf86b89804f35d894058eb49ec6
---
M manifests/ganglia.pp
M modules/ganglia_new/manifests/configuration.pp
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 2a8711b..7612e82 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -158,6 +158,9 @@
"labsnfs" => {
"name" => "Labs NFS cluster",
"ip_oct" => "40" },
+ 'cache_misc' => {
+ 'name' => 'Misc Web caching cluster',
+ 'ip_oct' => '41' },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
@@ -338,6 +341,7 @@
"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',
}
$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"
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index 09a0ee2..f977e99 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -111,6 +111,9 @@
"labsnfs" => {
"name" => "Labs NFS cluster",
"id" => "40" },
+ 'cache_misc' => {
+ 'name' => 'Misc Web caching cluster',
+ 'ip_oct' => '41' },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
--
To view, visit https://gerrit.wikimedia.org/r/79057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4eb1b68aa3fbdaf86b89804f35d894058eb49ec6
Gerrit-PatchSet: 2
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
