Faidon Liambotis has submitted this change and it was merged.
Change subject: logstash: add Ganglia group and specify aggregators
......................................................................
logstash: add Ganglia group and specify aggregators
* Add a monitor_group for LogStash
* Add a Ganglia group
* Specify logstash1001 & logstash1003 as aggregators
Change-Id: Ib111e53b6afc7f7eb4407d204246a9f69f11bdd4
---
M manifests/ganglia.pp
M manifests/role/logstash.pp
M manifests/site.pp
3 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 01f5384..1cfac05 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -165,6 +165,9 @@
'elasticsearch' => {
'name' => 'Elasticsearch cluster',
'ip_oct' => '42' },
+ 'logstash' => {
+ 'name' => 'Logstash cluster',
+ 'ip_oct' => '43' },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
@@ -348,6 +351,7 @@
"Mobile caches ulsfo" =>
'cp4011.ulsfo.wmnet cp4019.ulsfo.wmnet',
"Text caches ulsfo" =>
'cp4008.ulsfo.wmnet cp4016.ulsfo.wmnet',
"Elasticsearch eqiad" =>
'elastic1001.eqiad.wmnet elastic1007.eqiad.wmnet',
+ "Logstash eqiad" =>
'logstash1001.eqiad.wmnet logstash1003.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"'
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d59f55d..691ee17 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -1,6 +1,8 @@
-# = Class: role::logstash
+@monitor_group { 'logstash_eqiad': description => 'eqiad logstash' }
+
+# == Class: role::logstash
#
-# This class sets up LogStash+Elasticsearch configuration in a WMF-specific way
+# Provisions LogStash and ElasticSearch.
#
class role::logstash {
include ::elasticsearch::ganglia
diff --git a/manifests/site.pp b/manifests/site.pp
index 07b6a95..7e3a48f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2754,6 +2754,10 @@
include accounts::aaron
include accounts::bd808
+ if $::hostname =~ /^logstash100[13]$/ {
+ $ganglia_aggregator = true
+ }
+
sudo_user { ['aaron', 'bd808']: # RT 6366
privileges => ['ALL = NOPASSWD: ALL'],
}
--
To view, visit https://gerrit.wikimedia.org/r/99330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib111e53b6afc7f7eb4407d204246a9f69f11bdd4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
