diff options
| author | Kristian Lyngstol <kly@kly.no> | 2016-11-03 23:48:36 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly.no> | 2016-11-03 23:48:36 +0100 |
| commit | 1c3667b443d66ecf26001033a738060e51473a6f (patch) | |
| tree | 4bbae7599f156fb10ba80b3adce446d546a4bf78 /build | |
| parent | 3123b321c4a4cdfdf5ab38fbe85b63c4165d1eaa (diff) | |
Further graph tweaks, now with graphite 0.9.15
- Upgrade to 0.9.15 (that was a lot more work than the commit reveals)
- Numerous color tweaks to make it prettier
- Use SVG instead of PNG
- Use correct perSecond() provided in 0.9.14 instead of derivative()
Still more to come I suppose
Diffstat (limited to 'build')
| -rwxr-xr-x | build/test/dummy-graphite.start | 8 | ||||
| -rw-r--r-- | build/test/gondul-graphite-test.Dockerfile | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/build/test/dummy-graphite.start b/build/test/dummy-graphite.start index 992928e..9d83cfb 100755 --- a/build/test/dummy-graphite.start +++ b/build/test/dummy-graphite.start @@ -1,9 +1,11 @@ #!/usr/bin/env bash if [ ! -r /var/lib/graphite/graphite.db ]; then - graphite-manage migrate - graphite-manage createsuperuser --noinput --username=admin --email root@localhost.localdomain - chown -R _graphite:_graphite /var/lib/graphite/ + # graphite-manage migrate + django-admin migrate --settings=graphite.settings + # graphite-manage createsuperuser --noinput --username=admin --email root@localhost.localdomain + django-admin createsuperuser --settings=graphite.settings --noinput --username=admin --email root@localhost.localdomain fi +chown -R _graphite:_graphite /var/lib/graphite/ service apache2 start service carbon-cache start while true; do sleep 10; done diff --git a/build/test/gondul-graphite-test.Dockerfile b/build/test/gondul-graphite-test.Dockerfile index d16efba..ec79c52 100644 --- a/build/test/gondul-graphite-test.Dockerfile +++ b/build/test/gondul-graphite-test.Dockerfile @@ -1,7 +1,11 @@ -FROM debian:jessie +FROM ubuntu:yakkety RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y graphite-carbon graphite-web apache2 RUN apt-get install -y libapache2-mod-wsgi RUN cp /usr/share/graphite-web/apache2-graphite.conf /etc/apache2/sites-available/graphite-web.conf +RUN sed -i 's/<\/VirtualHost>//' /etc/apache2/sites-available/graphite-web.conf +RUN echo 'WSGIApplicationGroup %{GLOBAL}' >> /etc/apache2/sites-available/graphite-web.conf +RUN echo '</VirtualHost>' >> /etc/apache2/sites-available/graphite-web.conf + RUN a2ensite graphite-web RUN a2dissite 000-default RUN a2enmod wsgi |