Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: cleanup labs instances metrics
......................................................................
graphite: cleanup labs instances metrics
Periodically cleanup labs instances data older than 90d.
Bug: T143405
Change-Id: I2a5e568fc45ae9de712af1dc506cf618a8ac9fe9
---
M modules/role/manifests/graphite/production.pp
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/role/manifests/graphite/production.pp
b/modules/role/manifests/graphite/production.pp
index 7d9e4f6..05dc90f 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -5,8 +5,10 @@
# Instance requires people to authenticate via LDAP before they can see
metrics.
#
class role::graphite::production {
+ $storage_dir = '/var/lib/carbon'
+
class { 'role::graphite::base':
- storage_dir => '/var/lib/carbon',
+ storage_dir => $storage_dir,
auth => true,
c_relay_settings => {
forward_clusters => {
@@ -25,6 +27,12 @@
}
}
+ # Cleanup stale labs instances data - T143405
+ tmpreaper::reap { 'graphite-labs-instances':
+ path => "${storage_dir}/instances",
+ age => '90d',
+ }
+
$graphite_hosts = [
'graphite1001.eqiad.wmnet',
'graphite1003.eqiad.wmnet',
@@ -36,7 +44,7 @@
include rsync::server
rsync::server::module { 'carbon':
- path => '/var/lib/carbon',
+ path => $storage_dir,
uid => '_graphite',
gid => '_graphite',
hosts_allow => $graphite_hosts,
--
To view, visit https://gerrit.wikimedia.org/r/323339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5e568fc45ae9de712af1dc506cf618a8ac9fe9
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
