Added specific graph for CPUs

js/dashboard.js

@@ -232,6 +232,14 @@ function createPanel(graphName, graphData, filename) {
   return div;
 }
 
+/*
+ * Create generic graph options
+ */
+function createInitialOptions(graphData) {
+  options = {}
+
+  return options;
+}
 
 /*
  * Create the graph d3 object
@@ -241,14 +249,36 @@ function displayGraph(graphName, graphData, graphFormat, panel, dmin, dmax) {
       var elt = d3.select(this);
 
       nv.addGraph(function() {
-          graphId = graphName.replace(/[&\/\\#,+()$~%.'":*?<>{}\s]/g,'_');
+          graphId    = graphName.replace(/[&\/\\#,+()$~%.'":*?<>{}\s]/g,'_');
-          graphFu = graphId + '_graph';
+          graphFu    = graphId + '_graph';
+          graphFuPre = graphId + '_options';
+          options    = createInitialOptions(graphData);
 
-          var chart = nv.models.lineChart()
+          if (typeof window[graphFuPre] == "function") {
-            .margin({left: 100})
+            options = window[graphFuPre]();
-            .useInteractiveGuideline(true)
+          }
-            .showLegend(true)
+
-          ;
+          if (options.type == 'stacked') {
+            var chart = nv.models.stackedAreaChart()
+              .margin({left: 100})
+              .useInteractiveGuideline(true)
+              .showLegend(true)
+              .style('expand')
+              .interpolate("basis")
+              .showControls(false)
+              ;
+          } else if (options.type == 'pie') {
+            var chart = nv.models.bulletChart()
+              .margin({left: 100})
+              ;
+          } else {
+            var chart = nv.models.lineChart()
+              .margin({left: 100})
+              .useInteractiveGuideline(true)
+              .interpolate("basis")
+              .showLegend(true)
+            ;
+          }
 
           graphs.xAxis(chart.xAxis);
 
@@ -327,11 +357,10 @@ function displayFocusGraph(graphs, dmin, dmax) {
   x.domain(d3.extent(data.map(function(val) { return val.x })));
   y.domain([0, d3.max(data.map(function(val) { return val.y }))]);
 
-  brush.x(x)
+  brush.x(x).extent([dmin, dmax]);
-    .extent([dmin, dmax]);
 
   var area = d3.svg.area()
-    .interpolate("monotone")
+    .interpolate("basis")
     .x(function(d) { return x(d.x) })
     .y1(function(d) { return y(d.y) })
     .y0(height);

js/graph.js

@@ -22,6 +22,18 @@ function dsk_total_graph(graph) {
 
 function total_cpu_usage_graph(graph) {
   graph.yAxis.axisLabel('%');
+  graph.color(function (d) {
+      if (d.key == 'idl') return 'white'; if (d.key == 'usr') return '#aec7e8'; if (d.key == 'sys') return '#ff7f7f';
+      if (d.key == 'stl') return '#7b94b5'; return '#ffd384';
+  })
+}
+
+function total_cpu_usage_options() {
+  return { type: 'stacked' };
+}
+
+function total_cpu_usage_data(data) {
+  return data;
 }