From 4d9fc1c8e8745707d78d29d6e3d999979d75f2b6 Mon Sep 17 00:00:00 2001
From: Florian N <michael@hostechs.com>
Date: Fri, 7 Feb 2014 10:35:28 -0500
Subject: [PATCH] calculate traffic

---
 main/views.py       |  2 +-
 templates/main.html |  6 +++---
 usage/views.py      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/views.py b/main/views.py
index 789f972..4d1e401 100755
--- a/main/views.py
+++ b/main/views.py
@@ -121,7 +121,7 @@ def get_traffic(request):
     Get the traffic for the specified interface
     """
     try:
-	pipe = os.popen("cat /proc/net/dev |" + "grep " + request +  "| awk '{print $2, $10}'")
+	pipe = os.popen("cat /proc/net/dev |" + "grep " + request +  "| awk '{print $1, $9}'")
 	data = pipe.read().strip().split(':',1)[-1]
 	pipe.close()
 
diff --git a/templates/main.html b/templates/main.html
index 9bee9e1..82e0d7b 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -90,7 +90,7 @@
             <!-- /widget-header -->
             <div class="widget-content">
         	<p></p>
-                <canvas id="cpuuChart" width="270" height="200"></canvas>
+                <canvas id="cpuuChart" width="270" height="180"></canvas>
                 <div>
         	    <span class="cpuf">{% trans "Free" %}</span>
         	    <span class="cpuu">{% trans "Used" %}</span>
@@ -356,7 +356,7 @@ var trf_ctx = $("#trfChart").get(0).getContext("2d");
                 var options = {
             	    animation : false,
                     pointDotRadius : 2,
-                    scaleLabel : "<%=value%> Kb"
+                    scaleLabel : "<%=value%>"
                 }
                 trfChart.Line(data, options);
             });
@@ -382,7 +382,7 @@ var load_ctx = $("#loadChart").get(0).getContext("2d");
             window.setInterval('dashboard.getDisk()', {{ time_refresh_long }});
             window.setInterval('dashboard.getUsers()', {{ time_refresh_long }});
             window.setInterval('cpuu_usage()', {{ time_refresh }});
-            window.setInterval('traffic_usage()', 1000);
+            window.setInterval('traffic_usage()', {{ time_refresh }});
         });
 
 $(function pageLoad() {
diff --git a/usage/views.py b/usage/views.py
index 6676dae..bf484dc 100755
--- a/usage/views.py
+++ b/usage/views.py
@@ -293,25 +293,25 @@ def gettraffic(request):
                 break
 
     if len(datasets_in_i) <= 1:
-        datasets_in_i.append(int(traffic['traffic_in']))
+        datasets_in_i.append(float(traffic['traffic_in']))
     if len(datasets_in_i) == 2:
-        datasets_in_i.append(int(traffic['traffic_in']))
+        datasets_in_i.append(float(traffic['traffic_in']))
         del datasets_in_i[0]
     if len(datasets_out_o) <= 1:
-        datasets_out_o.append(int(traffic['traffic_out']))
+        datasets_out_o.append(float(traffic['traffic_out']))
     if len(datasets_out_o) == 2:
-        datasets_out_o.append(int(traffic['traffic_out']))
+        datasets_out_o.append(float(traffic['traffic_out']))
         del datasets_out_o[0]
 
     if len(datasets_in) <= 9:
-        datasets_in.append(float((datasets_in_i[1] - datasets_in_i[0]) / 1024 ))
+        datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh / 1000 )))
     if len(datasets_in) == 10:
-        datasets_in.append(float((datasets_in_i[1] - datasets_in_i[0]) / 1024 ))
+        datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh / 1000 )))
         del datasets_in[0]
     if len(datasets_out) <= 9:
-        datasets_out.append(float((datasets_out_o[1] - datasets_out_o[0]) / 1024 ))
+        datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh / 1000 )))
     if len(datasets_out) == 10:
-        datasets_out.append(float((datasets_out_o[1] - datasets_out_o[0]) / 1024 ))
+        datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh / 1000 )))
         del datasets_out[0]
 
 
@@ -323,7 +323,7 @@ def gettraffic(request):
             datasets_in[9] += 0.1
 
     traff = {
-        'labels': [""] * 10,
+        'labels': ["KBps"] * 10,
         'datasets': [
             {
                 "fillColor": "rgba(105,210,231,0.5)",