Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: use keepLastValue where appropriate
......................................................................
swift: use keepLastValue where appropriate
Change-Id: If7db9f7c31e97ffaf48300cf9df2e271a89bd01a
---
M files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
M files/gdash/dashboards/swift.eqiad-prod/25_dispersion.graph
M manifests/swift.pp
M modules/swift_new/manifests/monitoring/graphite.pp
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
b/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
index e31faf1..6ed2f66 100644
--- a/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
+++ b/files/gdash/dashboards/swift.codfw-prod/25_dispersion.graph
@@ -2,8 +2,8 @@
field :container_avail,
:alias => "container avail %",
- :data => "swift.codfw-prod.dispersion.container.pct_found"
+ :data => "keepLastValue(swift.codfw-prod.dispersion.container.pct_found)"
field :object_avail,
:alias => "object avail %",
- :data => "swift.codfw-prod.dispersion.object.pct_found"
+ :data => "keepLastValue(swift.codfw-prod.dispersion.object.pct_found)"
diff --git a/files/gdash/dashboards/swift.eqiad-prod/25_dispersion.graph
b/files/gdash/dashboards/swift.eqiad-prod/25_dispersion.graph
index fa9e26b..8c0b7ca 100644
--- a/files/gdash/dashboards/swift.eqiad-prod/25_dispersion.graph
+++ b/files/gdash/dashboards/swift.eqiad-prod/25_dispersion.graph
@@ -2,8 +2,8 @@
field :container_avail,
:alias => "container avail %",
- :data => "swift.eqiad-prod.dispersion.container.pct_found"
+ :data => "keepLastValue(swift.eqiad-prod.dispersion.container.pct_found)"
field :object_avail,
:alias => "object avail %",
- :data => "swift.eqiad-prod.dispersion.object.pct_found"
+ :data => "keepLastValue(swift.eqiad-prod.dispersion.object.pct_found)"
diff --git a/manifests/swift.pp b/manifests/swift.pp
index a951fa0..f29101c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -195,7 +195,7 @@
class swift::monitoring::graphite {
monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_object':
description => 'swift eqiad-prod object availability',
- metric => 'swift.eqiad-prod.dispersion.object.pct_found',
+ metric =>
'keepLastValue(swift.eqiad-prod.dispersion.object.pct_found)',
from => '1hours',
warning => 95,
critical => 90,
@@ -205,7 +205,7 @@
monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_container':
description => 'swift eqiad-prod container availability',
- metric => 'swift.eqiad-prod.dispersion.container.pct_found',
+ metric =>
'keepLastValue(swift.eqiad-prod.dispersion.container.pct_found)',
from => '30min',
warning => 92,
critical => 88,
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp
b/modules/swift_new/manifests/monitoring/graphite.pp
index b48111c..da6a15c 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift_new/manifests/monitoring/graphite.pp
@@ -3,7 +3,7 @@
) {
monitoring::graphite_threshold {
"swift_${swift_cluster}_dispersion_object":
description => "swift ${swift_cluster} object availability",
- metric =>
"swift.${swift_cluster}.dispersion.object.pct_found",
+ metric =>
"keepLastValue(swift.${swift_cluster}.dispersion.object.pct_found)",
from => '1hours',
warning => 95,
critical => 90,
@@ -13,7 +13,7 @@
monitoring::graphite_threshold {
"swift_${swift_cluster_dispersion_container}":
description => "swift ${swift_cluster} container availability",
- metric =>
"swift.${swift_cluster}.dispersion.container.pct_found",
+ metric =>
"keepLastValue(swift.${swift_cluster}.dispersion.container.pct_found)",
from => '30min',
warning => 92,
critical => 88,
--
To view, visit https://gerrit.wikimedia.org/r/203103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7db9f7c31e97ffaf48300cf9df2e271a89bd01a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
