@@ -303,6 +311,16 @@ dashboard.getUsers = function() {
$("#get-users").html( tr );
});
}
+dashboard.getIps = function() {
+ $.getJSON('/info/getips/{{ getips }}', function(data) {
+ var tr='';
+ $.each( data, function( index, item){
+ tr+='
| '+item[0]+' | '+item[1]+' |
';
+ })
+ tr+='';
+ $("#get-ips").html( tr );
+ });
+ }
var mem_ctx = $("#memoryChart").get(0).getContext("2d");
@@ -331,6 +349,19 @@ var cpu_ctx = $("#cpuuChart").get(0).getContext("2d");
});
}
+var trf_ctx = $("#trfChart").get(0).getContext("2d");
+ var trfChart = new Chart(trf_ctx);
+ function traffic_usage(){
+ $.getJSON('/info/gettraffic/', function(data) {
+ var options = {
+ animation : false,
+ pointDotRadius : 2,
+ scaleLabel : "<%=value%> Kb"
+ }
+ trfChart.Line(data, options);
+ });
+ }
+
var load_ctx = $("#loadChart").get(0).getContext("2d");
var loadChart = new Chart(load_ctx);
function load_average(){
@@ -351,15 +382,18 @@ 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);
});
$(function pageLoad() {
memory_usage();
load_average();
cpuu_usage();
+ traffic_usage();
dashboard.getUptime();
dashboard.getDisk();
dashboard.getUsers();
+ dashboard.getIps();
});
diff --git a/usage/views.py b/usage/views.py
index 992d50b..6676dae 100755
--- a/usage/views.py
+++ b/usage/views.py
@@ -45,7 +45,7 @@ def getdisk(request):
response.write(data)
return response
-def getusers(request):
+def getips(request):
"""
Return the online users
"""
@@ -53,11 +53,11 @@ def getusers(request):
return HttpResponseRedirect('/login')
try:
- getusers = get_users()
+ get_ips = get_ipaddress()
except Exception:
- getusers = None
+ get_ips = None
- data = simplejson.dumps(getusers)
+ data = simplejson.dumps(get_ips['itfip'])
response = HttpResponse()
response['Content-Type'] = "text/javascript"
response.write(data)
@@ -233,3 +233,120 @@ def loadaverage(request):
response.cookies['load_average'] = datasets
response.write(data)
return response
+
+
+def gettraffic(request):
+ """
+ Return the traffic for the interface
+ """
+ if not request.user.is_authenticated():
+ return HttpResponseRedirect('/login')
+
+ datasets_in = []
+ datasets_in_i = []
+ datasets_out = []
+ datasets_out_o = []
+ json_traffic = []
+ cookie_traffic = {}
+
+ try:
+ traffic = get_traffic('eth0')
+ except Exception:
+ traffic = 0
+
+ try:
+ cookies = request._cookies['traffic']
+ except Exception:
+ cookies = None
+
+ if not cookies:
+ datasets_in.append(0)
+ datasets_in_i.append(0)
+ datasets_out.append(0)
+ datasets_out_o.append(0)
+ else:
+ datasets = eval(cookies)
+ datasets_in = datasets[0]
+ datasets_out = datasets[1]
+ datasets_in_i = datasets[2]
+ datasets_out_o = datasets[3]
+
+ if len(datasets_in) > 10:
+ while datasets_in:
+ del datasets_in[0]
+ if len(datasets_in) == 10:
+ break
+ if len(datasets_in_i) > 2:
+ while datasets_in_i:
+ del datasets_in_i[0]
+ if len(datasets_in_i) == 2:
+ break
+ if len(datasets_out) > 10:
+ while datasets_out:
+ del datasets_out[0]
+ if len(datasets_out) == 10:
+ break
+ if len(datasets_out_o) > 2:
+ while datasets_out_o:
+ del datasets_out_o[0]
+ if len(datasets_out_o) == 2:
+ break
+
+ if len(datasets_in_i) <= 1:
+ datasets_in_i.append(int(traffic['traffic_in']))
+ if len(datasets_in_i) == 2:
+ datasets_in_i.append(int(traffic['traffic_in']))
+ del datasets_in_i[0]
+ if len(datasets_out_o) <= 1:
+ datasets_out_o.append(int(traffic['traffic_out']))
+ if len(datasets_out_o) == 2:
+ datasets_out_o.append(int(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 ))
+ if len(datasets_in) == 10:
+ datasets_in.append(float((datasets_in_i[1] - datasets_in_i[0]) / 1024 ))
+ del datasets_in[0]
+ if len(datasets_out) <= 9:
+ datasets_out.append(float((datasets_out_o[1] - datasets_out_o[0]) / 1024 ))
+ if len(datasets_out) == 10:
+ datasets_out.append(float((datasets_out_o[1] - datasets_out_o[0]) / 1024 ))
+ del datasets_out[0]
+
+
+ # Some fix division by 0 Chart.js
+ if len(datasets_in) == 10:
+ if sum(datasets_in) == 0:
+ datasets_in[9] += 0.1
+ if sum(datasets_in) / 10 == datasets_in[0]:
+ datasets_in[9] += 0.1
+
+ traff = {
+ 'labels': [""] * 10,
+ 'datasets': [
+ {
+ "fillColor": "rgba(105,210,231,0.5)",
+ "strokeColor": "rgba(105,210,231,1)",
+ "pointColor": "rgba(105,210,231,1)",
+ "pointStrokeColor": "#fff",
+ "data": datasets_in
+ },
+ {
+ "fillColor": "rgba(227,48,81,0.5)",
+ "strokeColor": "rgba(227,48,81,1)",
+ "pointColor": "rgba(227,48,81,1)",
+ "pointStrokeColor": "#fff",
+ "data": datasets_out
+ }
+ ]
+ }
+
+ cookie_traffic = [datasets_in, datasets_out, datasets_in_i, datasets_out_o]
+ data = simplejson.dumps(traff)
+ response = HttpResponse()
+ response['Content-Type'] = "text/javascript"
+ response.cookies['traffic'] = cookie_traffic
+ response.write(data)
+ return response
+