[MediaWiki-commits] [Gerrit] graphite: split alerts role - change (operations/puppet)

2015-05-06 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: graphite: split alerts role
..


graphite: split alerts role

Bug: T97754
Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
---
M manifests/role/graphite.pp
M manifests/site.pp
2 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 831a960..0b8f864 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -230,7 +230,15 @@
 
 include role::backup::host
 backup::set {'var-lib-carbon-whisper': }
+}
 
+# == Class: role::graphite::production::alerts
+#
+# Install icinga alerts on graphite metrics.
+# NOTE to be included only from one host, icinga will generate different alerts
+# for all hosts that include this class.
+#
+class role::graphite::production::alerts {
 include ::mediawiki::monitoring::graphite
 include ::eventlogging::monitoring::graphite
 include ::swift::monitoring::graphite
diff --git a/manifests/site.pp b/manifests/site.pp
index 3e7027a..47a7bda 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1122,6 +1122,7 @@
 include role::statsdlb
 include role::gdash
 include role::performance
+include role::graphite::production::alerts
 }
 
 # graphite test machine, currently with SSD caching + spinning disks

-- 
To view, visit https://gerrit.wikimedia.org/r/208083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] graphite: split alerts role - change (operations/puppet)

2015-05-01 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208083

Change subject: graphite: split alerts role
..

graphite: split alerts role

Bug: T97754
Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
---
M manifests/role/graphite.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/208083/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 831a960..9f89df6 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -230,7 +230,9 @@
 
 include role::backup::host
 backup::set {'var-lib-carbon-whisper': }
+}
 
+class role::graphite::production::alerts {
 include ::mediawiki::monitoring::graphite
 include ::eventlogging::monitoring::graphite
 include ::swift::monitoring::graphite
diff --git a/manifests/site.pp b/manifests/site.pp
index 8825cf3..7e60dba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1114,6 +1114,8 @@
 include role::statsdlb
 include role::gdash
 include role::performance
+# also generate alerts from this host
+include role::graphite::production::alerts
 }
 
 # graphite test machine, currently with SSD caching + spinning disks

-- 
To view, visit https://gerrit.wikimedia.org/r/208083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits