Merge branch 'master' of https://github.com/bleything/dje_cookbooks i…

…nto bleything-master
jbehrends · Feb 24, 2011 · e697d34 · e697d34
2 parents 6ac20e1 + 3f6a313
commit e697d34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -14,3 +14,8 @@ Ubuntu 10.04 (Lucid)
 
 I didn't see an easy way to set Graphite's credentials easily.
 I set those to root/root with an email address going no where.
+
+Ships with two default schemas, stats.* (for Etsy's statsd) and a
+catchall that matches anything. The catchall retains minutely data for
+13 months, as in the default config. stats retains data every 10 seconds
+for 6 hours, every minute for a week, and every 10 minutes for 5 years.
diff --git a/templates/default/storage-schemas.conf.erb b/templates/default/storage-schemas.conf.erb
@@ -1,4 +1,9 @@
-[everything_1min_13months]
+[stats]
 priority = 100
-pattern = .*
+pattern = ^stats\..*
+retentions = 10:2160,60:10080,600:262974
+
+[catchall]
+priority = 0
+pattern = ^.*
 retentions = 60:565920