Changeset 9625 for branches

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.

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3

Files:

• App_Code (added)
• App_Code/ChartHelper.cshtml (added)
• App_Start/BundleConfig.cs (modified) (2 diffs)
• App_Start/FilterConfig.cs (modified) (1 diff)
• App_Start/RouteConfig.cs (modified) (1 diff)
• Content/Site.css (modified) (1 diff)
• Controllers/ChartDataController.cs (added)
• Controllers/HomeController.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Statistics-3.3.csproj (modified) (2 diffs)
• Views/Home/Index.cshtml (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/BundleConfig.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Services.Hive.Statistics {
-  public class BundleConfig {
+  public static class BundleConfig {
     public static void RegisterBundles(BundleCollection bundles) {
       bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
@@ -56 +56 @@
 
       bundles.Add(new ScriptBundle("~/Scripts/jqPlot/jquery.jqplot").Include(
-                  "~/Scripts/jqPlot/jquery.jqplot.js"));
+                  "~/Scripts/jqPlot/jquery.jqplot.js",
+                  "~/Scripts/jqPlot/plugins/jqplot.highlighter.js",
+                  "~/Scripts/jqPlot/plugins/jqplot.dateAxisRenderer.js",
+                  "~/Scripts/jqPlot/plugins/jqplot.cursor.js"));
 
       bundles.Add(new StyleBundle("~/Styles/jqPlot/jquery.jqplot").Include(

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/FilterConfig.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Services.Hive.Statistics {
-  public class FilterConfig {
+  public static class FilterConfig {
     public static void RegisterGlobalFilters(GlobalFilterCollection filters) {
       filters.Add(new HandleErrorAttribute());

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/RouteConfig.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Services.Hive.Statistics {
-  public class RouteConfig {
+  public static class RouteConfig {
     public static void RegisterRoutes(RouteCollection routes) {
       routes.IgnoreRoute("{resource}.axd/{*pathInfo}");

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Content/Site.css

@@ -184 +184 @@
   border: 1px solid #CCC;
 }
+
+.charts {
+  font-size: 1.5em;
+}
+
+.charts > div {
+  height: 300px;
+  margin-top: 15px;
+  margin-bottom: 5px;
+  margin-left: 10px;
+  margin-right: 20px;
+}

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/HomeController.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Web.Helpers;
 using System.Web.Mvc;
 using HeuristicLab.Services.Hive.DataAccess;
@@ -71 +69 @@
       throw new Exception();
     }
-
-    public ActionResult Test() {
-      var data = new Dictionary<string, float>
-        {
-            {"test", 10.023f},
-            {"test2", 20.020f},
-            {"test3", 19.203f},
-            {"test4", 4.039f},
-            {"test5", 5.343f}
-    };
-
-      var chart = new Chart(600, 400)
-        .AddTitle("Testchart")
-        .AddSeries(
-          name: "13456",
-          chartType: "Area",
-          xValue: new[] { 1, 2, 3, 4, 5 },
-          yValues: new[] { 10, 20, 35, 70, 50 }
-        );
-
-      chart.Write("png");
-
-      return null;
-    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/HeuristicLab.Services.Hive.Statistics-3.3.csproj

@@ -108 +108 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\AccountController.cs" />
+    <Compile Include="Controllers\ChartDataController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
+    <Compile Include="Helper\HtmlChartHelper.cs" />
     <Compile Include="Models\OverallStatistics.cs" />
     <Compile Include="Global.asax.cs">
@@ -116 +118 @@
     <Compile Include="Models\AccountModels.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="App_Code\ChartHelper.cshtml" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>

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)
 }