Merge pull request heavywater#3 from heavywater/feature/tuned-graphite

Extracted tuning from production deployment
obazoud · Feb 15, 2012 · 5d12d67 · 5d12d67
2 parents 1a28316 + 98bc7f3
commit 5d12d67
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/attributes/graphite.rb b/attributes/graphite.rb
@@ -14,3 +14,4 @@
 default[:graphite][:carbon][:cache_query_interface] =     "127.0.0.1"
 
 default[:graphite][:password] = "change_me"
+default[:graphite][:url] = "graphite"
diff --git a/metadata.rb b/metadata.rb
@@ -1,12 +1,14 @@
 maintainer       "Heavy Water Software Inc."
-maintainer_email "darrin@heavywater.ca"
+maintainer_email "ops@hw-ops.com"
 license          "Apache 2.0"
 description      "Installs/Configures graphite"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.3"
+version          "0.2.0"
 
-depends  "python"
-depends  "apache2"
 supports "ubuntu"
 
+depends  "python"
+depends  "apache2"
 depends "runit"
+
+suggests "graphiti"
diff --git a/recipes/carbon.rb b/recipes/carbon.rb
@@ -1,4 +1,5 @@
 package "python-twisted"
+package "python-simplejson"
 
 version = node[:graphite][:version]
 

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/templates/default/carbon.conf.erb b/templates/default/carbon.conf.erb
@@ -4,7 +4,7 @@ LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
 # Specify the user to drop privileges to
 # If this is blank carbon runs as the user that invokes it
 # This user must have write access to the local data directory
-USER = 
+USER =
 
 # Limit the size of the cache to avoid swapping or becoming CPU bound.
 # Sorts and serving cache queries gets more expensive as the cache grows.

diff --git a/templates/default/graphite-vhost.conf.erb b/templates/default/graphite-vhost.conf.erb
@@ -7,7 +7,7 @@ NameVirtualHost *:80
 # in this file to your chosen install location.
 
 <VirtualHost *:80>
-        ServerName graphite
+        ServerName <%= node[:graphite][:url] %>
         DocumentRoot "/opt/graphite/webapp"
         ErrorLog /opt/graphite/storage/log/webapp/error.log
         CustomLog /opt/graphite/storage/log/webapp/access.log common

diff --git a/templates/default/storage-schemas.conf.erb b/templates/default/storage-schemas.conf.erb
@@ -1,9 +1,4 @@
-[stats]
-priority = 100
-pattern = ^stats\..*
-retentions = 10:2160,60:10080,600:262974
-
 [catchall]
 priority = 0
 pattern = ^.*
-retentions = 60:565920
+retentions = 60:100800,900:63000