Browse Source

Allow to configure the graphite server in settings.py

Baptiste Jonglez 10 years ago
parent
commit
9d188849a0
2 changed files with 8 additions and 4 deletions
  1. 1 0
      coin/settings.py
  2. 7 4
      coin/vpn/views.py

+ 1 - 0
coin/settings.py

@@ -249,6 +249,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = {
     "is_superuser": "cn=coin_admin,ou=groups,ou=unix,o=ILLYSE,l=Villeurbanne,st=RHA,c=FR"
 }
 
+GRAPHITE_SERVER = "http://graphite-dev.illyse.org"
 
 # Surcharge les paramètres en utilisant le fichier settings-local.py
 try:

+ 7 - 4
coin/vpn/views.py

@@ -1,11 +1,13 @@
+import os
+from urllib2 import urlopen
+
 from django.contrib.auth.models import User
 from django.shortcuts import render_to_response, get_object_or_404
 from django.views.generic.detail import DetailView
+from django.conf import settings
 
 from coin.vpn.models import VPNSubscription
 
-from urllib2 import urlopen
-
 
 class VPNView(DetailView):
 
@@ -41,9 +43,10 @@ def get_graph(request, vpn_id, period="daily"):
     if period not in time_periods:
         period = 'daily'
 
-    graph_url = "http://graphite-dev.illyse.org/render/?width=586&height=308&from=%(period)s&" \
+    graph_url = os.path.join(settings.GRAPHITE_SERVER,
+                "render/?width=586&height=308&from=%(period)s&" \
                 "target=alias%28scaleToSeconds%28vpn1.%(login)s.downrxbytes%2C1%29%2C%20%22Download%22%29&" \
                 "target=alias%28scaleToSeconds%28vpn1.%(login)s.uptxbytes%2C1%29%2C%20%22Upload%22%29&" \
                 "title=VPN%20Usage%20%(login)s" % \
-                    { 'period': time_periods[period], 'login': vpn.login }
+                    { 'period': time_periods[period], 'login': vpn.login })
     return HttpResponse(urlopen(graph_url), mimetype="image/png")