Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401917 )
Change subject: graphite: cleanup stale ORES metrics
......................................................................
graphite: cleanup stale ORES metrics
Also group cleanups into a separate class.
Bug: T169969
Change-Id: I01b37944e614a3e2e5a310094282381b67ade6dc
---
A modules/role/manifests/graphite/cleanup.pp
M modules/role/manifests/graphite/production.pp
2 files changed, 40 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/401917/1
diff --git a/modules/role/manifests/graphite/cleanup.pp
b/modules/role/manifests/graphite/cleanup.pp
new file mode 100644
index 0000000..efa6be0
--- /dev/null
+++ b/modules/role/manifests/graphite/cleanup.pp
@@ -0,0 +1,39 @@
+class role::graphite::cleanup {
+ # Cleanup stale labs instances data - T143405
+ graphite::whisper_cleanup { 'graphite-labs-instances':
+ directory => "${storage_dir}/whisper/instances",
+ }
+
+ # Cleanup eventstreams rdkafka stale data - T160644
+ graphite::whisper_cleanup { 'graphite-eventstreams':
+ directory => "${storage_dir}/whisper/eventstreams/rdkafka",
+ keep_days => 5,
+ }
+
+ # Cleanup zuul data
+ graphite::whisper_cleanup { 'graphite-zuul':
+ directory => "${storage_dir}/whisper/zuul",
+ }
+ # Zuul also generates metrics related to Gerrit
+ graphite::whisper_cleanup { 'graphite-zuul-gerrit':
+ directory => "${storage_dir}/whisper/gerrit",
+ }
+
+ # Nodepool, which has several metrics for each of the Jenkins jobs
+ graphite::whisper_cleanup { 'graphite-nodepool':
+ directory => "${storage_dir}/whisper/nodepool",
+ keep_days => 15,
+ }
+
+ # Cassandra metrics - T179057
+ graphite::whisper_cleanup { 'graphite-cassandra':
+ directory => "${storage_dir}/whisper/cassandra",
+ keep_days => 182,
+ }
+
+ # ORES metrics - T169969
+ graphite::whisper_cleanup { 'graphite-ores':
+ directory => "${storage_dir}/whisper/ores",
+ keep_days => 30,
+ }
+}
diff --git a/modules/role/manifests/graphite/production.pp
b/modules/role/manifests/graphite/production.pp
index b0b33b0..e96906f 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -9,6 +9,7 @@
include ::standard
include ::base::firewall
+ include ::role::graphite::cleanup
class { 'role::graphite::base':
storage_dir => $storage_dir,
@@ -30,38 +31,6 @@
['^MediaWiki\.wanobjectcache\.[a-zA-Z0-9]{32}', 'blackhole'],
]
}
- }
-
- # Cleanup stale labs instances data - T143405
- graphite::whisper_cleanup { 'graphite-labs-instances':
- directory => "${storage_dir}/whisper/instances",
- }
-
- # Cleanup eventstreams rdkafka stale data - T160644
- graphite::whisper_cleanup { 'graphite-eventstreams':
- directory => "${storage_dir}/whisper/eventstreams/rdkafka",
- keep_days => 5,
- }
-
- # Cleanup zuul data
- graphite::whisper_cleanup { 'graphite-zuul':
- directory => "${storage_dir}/whisper/zuul",
- }
- # Zuul also generates metrics related to Gerrit
- graphite::whisper_cleanup { 'graphite-zuul-gerrit':
- directory => "${storage_dir}/whisper/gerrit",
- }
-
- # Nodepool, which has several metrics for each of the Jenkins jobs
- graphite::whisper_cleanup { 'graphite-nodepool':
- directory => "${storage_dir}/whisper/nodepool",
- keep_days => 15,
- }
-
- # Cassandra metrics - T179057
- graphite::whisper_cleanup { 'graphite-cassandra':
- directory => "${storage_dir}/whisper/cassandra",
- keep_days => 182,
}
$graphite_hosts = [
--
To view, visit https://gerrit.wikimedia.org/r/401917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b37944e614a3e2e5a310094282381b67ade6dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
