Changeset 9625 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home

Timestamp:

06/13/13 17:50:00 (11 years ago)

Author:

pfleck

Message:

#2063:
Insert charts on index page for CPU utilization, cores and memory usage.
Added html helper for generating chart javascript.
Added ChartDataController for generating JSON data for the charts.

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/Index.cshtml (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/Index.cshtml

@@ -18 +18 @@
         </tr>
         <tr>
+            <td>Used Cores</td>
+            <td>@Model.CurrentlyUsedCores</td>
+        </tr>
+        <tr>
             <td>System-Wide Waiting Tasks</td>
             <td>@Model.CurrentlyJobsWaiting</td>
-        </tr>
-        <tr>
-            <td>Used Cores</td>
-            <td>@Model.CurrentlyUsedCores</td>
         </tr>
         <tr>
@@ -36 +36 @@
 </section>
 
-<section>
-    <div id="chartdiv" style="height:400px;width:300px;"></div>
+<section class="charts">
+    <div id="AverageCpuUtilization"></div>
+    <div id="UsedCores"></div>
+    <div id="UsedMemory"></div>
 </section>
 
 @section Styles {
-    @Styles.Render("~/Scripts/jqPlot/jquery.jqplot")
+    @Styles.Render("~/Styles/jqPlot/jquery.jqplot")
 }
 
 @section Scripts {
     @Scripts.Render("~/Scripts/jqPlot/jquery.jqplot")
-    <script>
-        $.jqplot('chartdiv', [[[1, 2], [3, 5.12], [5, 13.1], [7, 33.6], [9, 85.9], [11, 219.9]]]);
-    </script>
+    @ChartHelper.AjaxDataRenderer()
+
+    @ChartHelper.LineChartTime(
+        "AverageCpuUtilization",
+        Url.Action("AverageCpuUtilization", "ChartData"),
+        title: "Avg. CPU Utilization History of all Slaves",
+        axisYFormat: "%.2f%%",
+        minY: 0, maxY: 100)
+
+    @ChartHelper.LineChartTime(
+        "UsedCores",
+        Url.Action("UsedCores", "ChartData"),
+        title: "Cores / Used Cores",
+        minY: 0)
+
+    @ChartHelper.LineChartTime(
+        "UsedMemory",
+        Url.Action("UsedMemory", "ChartData"),
+        title: "Memory / Used Memory",
+        minY: 0)
 }