Permalink
Browse files

Update to graphite version 0.9.9, allow ganglia web interface to run …

…as well as graphite.
  • Loading branch information...
luckymike committed Nov 10, 2011
1 parent d8dca64 commit b48fbf3e00b44cb25c9d98e235f8bf8e39a78cc8
Showing with 33 additions and 38 deletions.
  1. +11 −12 attributes/graphite.rb
  2. +5 −5 recipes/carbon.rb
  3. +6 −16 recipes/web.rb
  4. +5 −5 recipes/whisper.rb
  5. +6 −0 templates/default/graphite-vhost.conf.erb
View
@@ -1,15 +1,14 @@
-default[:graphite][:carbon][:line_receiver_interface] = "127.0.0.1"
-default[:graphite][:carbon][:pickle_receiver_interface] = "127.0.0.1"
-default[:graphite][:carbon][:cache_query_interface] = "127.0.0.1"
+default[:graphite][:version] = "0.9.9"
+
+default[:graphite][:carbon][:uri] = "http://launchpadlibrarian.net/82112362/carbon-#{node[:graphite][:version]}.tar.gz"
+default[:graphite][:carbon][:checksum] = "b3d42e3b93c09"
-default[:graphite][:carbon][:version] = "0.9.7"
-default[:graphite][:carbon][:uri] = "http://launchpadlibrarian.net/61904798/carbon-0.9.7.tar.gz"
-default[:graphite][:carbon][:checksum] = "ba698aca"
+default[:graphite][:whisper][:uri] = "http://launchpadlibrarian.net/82112367/whisper-#{node[:graphite][:version]}.tar.gz"
+default[:graphite][:whisper][:checksum] = "66c05eafe8d86"
-default[:graphite][:whisper][:version] = "0.9.7"
-default[:graphite][:whisper][:uri] = "http://launchpadlibrarian.net/61904764/whisper-0.9.7.tar.gz"
-default[:graphite][:whisper][:checksum] = "c6272ad6"
+default[:graphite][:graphite_web][:uri] = "http://launchpadlibrarian.net/82112308/graphite-web-#{node[:graphite][:version]}.tar.gz"
+default[:graphite][:graphite_web][:checksum] = "cc78bab7fb26b"
-default[:graphite][:graphite_web][:version] = "0.9.7c"
-default[:graphite][:graphite_web][:uri] = "http://launchpadlibrarian.net/62379635/graphite-web-0.9.7c.tar.gz"
-default[:graphite][:graphite_web][:checksum] = "a3e16265"
+default[:graphite][:carbon][:line_receiver_interface] = "127.0.0.1"
+default[:graphite][:carbon][:pickle_receiver_interface] = "127.0.0.1"
+default[:graphite][:carbon][:cache_query_interface] = "127.0.0.1"
View
@@ -1,20 +1,20 @@
package "python-twisted"
-remote_file "/usr/src/carbon-#{node.graphite.carbon.version}.tar.gz" do
+remote_file "/usr/src/carbon-#{node.graphite.version}.tar.gz" do
source node.graphite.carbon.uri
checksum node.graphite.carbon.checksum
end
execute "untar carbon" do
- command "tar xzf carbon-#{node.graphite.carbon.version}.tar.gz"
- creates "/usr/src/carbon-#{node.graphite.carbon.version}"
+ command "tar xzf carbon-#{node.graphite.version}.tar.gz"
+ creates "/usr/src/carbon-#{node.graphite.version}"
cwd "/usr/src"
end
execute "install carbon" do
command "python setup.py install"
- creates "/opt/graphite/lib/carbon-#{node.graphite.carbon.version}-py2.6.egg-info"
- cwd "/usr/src/carbon-#{node.graphite.carbon.version}"
+ creates "/opt/graphite/lib/carbon-#{node.graphite.version}-py2.6.egg-info"
+ cwd "/usr/src/carbon-#{node.graphite.version}"
end
template "/opt/graphite/conf/carbon.conf" do
View
@@ -2,35 +2,25 @@
package "python-cairo-dev"
package "python-django"
+package "python-django-tagging"
package "python-memcache"
package "python-rrdtool"
-remote_file "/usr/src/graphite-web-#{node.graphite.graphite_web.version}.tar.gz" do
+remote_file "/usr/src/graphite-web-#{node.graphite.version}.tar.gz" do
source node.graphite.graphite_web.uri
checksum node.graphite.graphite_web.checksum
end
execute "untar graphite-web" do
- command "tar xzf graphite-web-#{node.graphite.graphite_web.version}.tar.gz"
- creates "/usr/src/graphite-web-#{node.graphite.graphite_web.version}"
+ command "tar xzf graphite-web-#{node.graphite.version}.tar.gz"
+ creates "/usr/src/graphite-web-#{node.graphite.version}"
cwd "/usr/src"
end
-remote_file "/usr/src/graphite-web-#{node.graphite.graphite_web.version}/webapp/graphite/storage.py.patch" do
- source "http://launchpadlibrarian.net/65094495/storage.py.patch"
- checksum "8bf57821"
-end
-
-execute "patch graphite-web" do
- command "patch storage.py storage.py.patch"
- creates "/opt/graphite/webapp/graphite_web-#{node.graphite.graphite_web.version}-py2.6.egg-info"
- cwd "/usr/src/graphite-web-#{node.graphite.graphite_web.version}/webapp/graphite"
-end
-
execute "install graphite-web" do
command "python setup.py install"
- creates "/opt/graphite/webapp/graphite_web-#{node.graphite.graphite_web.version}-py2.6.egg-info"
- cwd "/usr/src/graphite-web-#{node.graphite.graphite_web.version}"
+ creates "/opt/graphite/webapp/graphite_web-#{node.graphite.version}-py2.6.egg-info"
+ cwd "/usr/src/graphite-web-#{node.graphite.version}"
end
template "/etc/apache2/sites-available/graphite" do
View
@@ -1,16 +1,16 @@
-remote_file "/usr/src/whisper-#{node.graphite.whisper.version}.tar.gz" do
+remote_file "/usr/src/whisper-#{node.graphite.version}.tar.gz" do
source node.graphite.whisper.uri
checksum node.graphite.whisper.checksum
end
execute "untar whisper" do
- command "tar xzf whisper-#{node.graphite.whisper.version}.tar.gz"
- creates "/usr/src/whisper-#{node.graphite.whisper.version}"
+ command "tar xzf whisper-#{node.graphite.version}.tar.gz"
+ creates "/usr/src/whisper-#{node.graphite.version}"
cwd "/usr/src"
end
execute "install whisper" do
command "python setup.py install"
- creates "/usr/local/lib/python2.6/dist-packages/whisper-#{node.graphite.whisper.version}.egg-info"
- cwd "/usr/src/whisper-#{node.graphite.whisper.version}"
+ creates "/usr/local/lib/python2.6/dist-packages/whisper-#{node.graphite.version}.egg-info"
+ cwd "/usr/src/whisper-#{node.graphite.version}"
end
@@ -29,6 +29,12 @@ NameVirtualHost *:80
SetHandler None
</Location>
+ <% if node[:recipes].include? "ganglia::web" -%>
+ <Location "/ganglia/">
+ SetHandler None
+ </Location>
+ <% end -%>
+
# NOTE: In order for the django admin site media to work you
# must change @DJANGO_ROOT@ to be the path to your django
# installation, which is probably something like:

0 comments on commit b48fbf3

Please sign in to comment.