From 8d18d40295d956d33e0e5ab990466e5944f3554d Mon Sep 17 00:00:00 2001
From: Retspen <anatoliy.guskov@gmail.com>
Date: Mon, 23 Mar 2015 11:23:17 +0200
Subject: [PATCH] Fixed graphs on instance page

---
 instances/views.py      | 12 ++++++------
 templates/instance.html | 43 +++++++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/instances/views.py b/instances/views.py
index 162745a..af3fd84 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -471,14 +471,14 @@ def inst_graph(request, compute_id, vname):
             datasets['cpu'].pop(0)
 
         for blk in blk_usage:
-            if cookies.get('hdd') == '{}' or not cookies.get('hdd') or not blk_usage:
+            if cookies.get('blk') == '{}' or not cookies.get('blk') or not blk_usage:
                 datasets_wr.append(0)
                 datasets_rd.append(0)
             else:
-                datasets['hdd'] = eval(cookies.get('hdd'))
+                datasets['blk'] = eval(cookies.get('blk'))
                 try:
-                    datasets_rd = datasets['hdd'][blk['dev']][0]
-                    datasets_wr = datasets['hdd'][blk['dev']][1]
+                    datasets_rd = datasets['blk'][blk['dev']][0]
+                    datasets_wr = datasets['blk'][blk['dev']][1]
                 except:
                     blk_error = True
 
@@ -518,14 +518,14 @@ def inst_graph(request, compute_id, vname):
             json_net.append({'dev': net['dev'], 'data': [datasets_rx, datasets_tx]})
             cookie_net[net['dev']] = [datasets_rx, datasets_tx]
 
-    data = json.dumps({'status': status, 'cpudata': datasets['cpu'], 'hdddata': json_blk, 'netdata': json_net, 'timeline':  datasets['timer']})
+    data = json.dumps({'status': status, 'cpudata': datasets['cpu'], 'blkdata': json_blk, 'netdata': json_net, 'timeline':  datasets['timer']})
 
     response = HttpResponse()
     response['Content-Type'] = "text/javascript"
     if status == 1:
         response.cookies['cpu'] = datasets['cpu']
         response.cookies['timer'] = datasets['timer']
-        response.cookies['hdd'] = cookie_blk
+        response.cookies['blk'] = cookie_blk
         response.cookies['net'] = cookie_net
     response.write(data)
     return response
\ No newline at end of file
diff --git a/templates/instance.html b/templates/instance.html
index f83909e..4763878 100644
--- a/templates/instance.html
+++ b/templates/instance.html
@@ -870,10 +870,7 @@
 </script>
 <script src="{{ STATIC_URL }}js/Chart.min.js"></script>
 <script>
-$( "#graphics" ).click();
-</script>
-<script>
-    $('#chartgraphs').on('shown.bs.tab', function (e) {
+    $('#chartgraphs').on('shown.bs.tab', function (event) {
         var cpuLineData = {
             labels : [0, 0, 0, 0, 0],
             datasets : [
@@ -969,25 +966,37 @@ $( "#graphics" ).click();
             netChart['{{ forloop.counter0 }}'] = new Chart(net_ctx_{{ forloop.counter0 }}).Line(netLineData, netOpt);
         {% endfor %}
 
-        function graph_usage() {
+        window.setInterval(function graph_usage() {
             $.getJSON('{% url 'inst_graph' compute_id vname %}', function (data) {
                 cpuChart.scale.xLabels = data.timeline;
-                for (var i = 0; i < 5; i++) {
+                for (var i = 0; i < data.cpudata.length; i++) {
                     cpuChart.datasets[0].points[i].value = data.cpudata[i];
                 }
                 cpuChart.update();
+
+                for (var j = 0; j < data.blkdata.length; j++) {
+                    diskChart[data.blkdata[j].dev].scale.xLabels = data.timeline;
+
+                    for (var i = 0; i < data.blkdata[j].data[0].length; i++) {
+                        diskChart[data.blkdata[j].dev].datasets[0].points[i].value = data.blkdata[j].data[0][i];
+                        diskChart[data.blkdata[j].dev].datasets[1].points[i].value = data.blkdata[j].data[1][i];
+                    }
+
+                    diskChart[data.blkdata[j].dev].update();
+                }
+
+                for (var j = 0; j < data.netdata.length; j++) {
+                    netChart[data.netdata[j].dev].scale.xLabels = data.timeline;
+
+                    for (var i = 0; i < data.netdata[j].data[0].length; i++) {
+                        netChart[data.netdata[j].dev].datasets[0].points[i].value = data.netdata[j].data[0][i];
+                        netChart[data.netdata[j].dev].datasets[1].points[i].value = data.netdata[j].data[1][i];
+                    }
+
+                    netChart[data.netdata[j].dev].update();
+                }
             });
-        }
-
-{##}
-{#        $(function(f) {#}
-{#            window.setInterval('graph_usage()', 2000);#}
-{#        });#}
-
+        }, 6000);
     });
-
-
-
-
  </script>
 {% endblock %}
\ No newline at end of file