Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209217
Change subject: icinga: unify swift alerts
......................................................................
icinga: unify swift alerts
Change-Id: Id56a129aa5d509df041c751f8feb16caad1bcd1f
---
M manifests/role/graphite.pp
M manifests/swift.pp
M modules/swift_new/manifests/monitoring/graphite.pp
3 files changed, 8 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/209217/2
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 831a960..57d5ae8 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -233,9 +233,8 @@
include ::mediawiki::monitoring::graphite
include ::eventlogging::monitoring::graphite
- include ::swift::monitoring::graphite
- include ::swift_new::monitoring::graphite
include ::graphite::monitoring::graphite
+ swift_new::monitoring::graphite { ['eqiad-prod', 'codfw-prod']: }
# Monitor production 5xx rates
monitoring::graphite_threshold { 'reqstats_5xx':
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 9afe6f9..9e3c36b 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -192,28 +192,6 @@
}
}
-class swift::monitoring::graphite {
- monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_object':
- description => 'swift eqiad-prod object availability',
- metric =>
'keepLastValue(swift.eqiad-prod.dispersion.object.pct_found)',
- from => '1hours',
- warning => 95,
- critical => 90,
- under => true,
- nagios_critical => false
- }
-
- monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_container':
- description => 'swift eqiad-prod container availability',
- metric =>
'keepLastValue(swift.eqiad-prod.dispersion.container.pct_found)',
- from => '30min',
- warning => 92,
- critical => 88,
- under => true,
- nagios_critical => false
- }
-}
-
class swift::storage {
Class['swift::base'] -> Class['swift::storage']
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp
b/modules/swift_new/manifests/monitoring/graphite.pp
index da6a15c..f2738ea 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift_new/manifests/monitoring/graphite.pp
@@ -1,9 +1,7 @@
-class swift_new::monitoring::graphite (
- $swift_cluster = $::swift_new::params::swift_cluster,
-) {
- monitoring::graphite_threshold {
"swift_${swift_cluster}_dispersion_object":
- description => "swift ${swift_cluster} object availability",
- metric =>
"keepLastValue(swift.${swift_cluster}.dispersion.object.pct_found)",
+class swift_new::monitoring::graphite {
+ monitoring::graphite_threshold { "swift_${name}_dispersion_object":
+ description => "swift ${name} object availability",
+ metric =>
"keepLastValue(swift.${name}.dispersion.object.pct_found)",
from => '1hours',
warning => 95,
critical => 90,
@@ -11,9 +9,9 @@
nagios_critical => false,
}
- monitoring::graphite_threshold {
"swift_${swift_cluster_dispersion_container}":
- description => "swift ${swift_cluster} container availability",
- metric =>
"keepLastValue(swift.${swift_cluster}.dispersion.container.pct_found)",
+ monitoring::graphite_threshold { "swift_${name}_dispersion_container":
+ description => "swift ${name} container availability",
+ metric =>
"keepLastValue(swift.${name}.dispersion.container.pct_found)",
from => '30min',
warning => 92,
critical => 88,
--
To view, visit https://gerrit.wikimedia.org/r/209217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id56a129aa5d509df041c751f8feb16caad1bcd1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
