Merge branch 'console'

fabware · Dec 2, 2010 · e75ce55 · e75ce55
2 parents c9f2593 + f67c950
commit e75ce55
Show file tree

Hide file tree

Showing 27 changed files with 2,130 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+results*.log
 results*.html
 *.tpl.js
 .reporting.test-output.html

diff --git a/TODO b/TODO
@@ -1,8 +1,20 @@
+- Console
+    - Update test spec on real data
+    - Adding a master node should add its slaves
+    - Really "add" a node (ping and connect to it)
+    - Running / stopped indicators for each node 
+    - Start & stop any node
+    - Fire up nodeload on a new machine
+    - Send a test script to run on any node
+    - Interactive console for each node 
+    - Edit test spec and "restart" (stop existing jobs / start updated test)
+    - Clean up removed nodes properly
+    - Download data as csv
 - Console webpage (stats)
 - Console webpage (node manager)
 - Add mem, disk io read + write + wait monitoring remote.ex.js
 - Remote testing should also aggregate summary-only stats (e.g. uniques)
 - Use stats.StatsGroup in monitoring and remote
 - Update READMEs
 - Write a DEVELOPERS doc that explains the components
-- Add zipf number generator
+- Add zipf number generator
diff --git a/console/console.html b/console/console.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+        <title>Nodeload Console</title>
+        <link type="text/css" href="css/pepper-grinder/jquery-ui-1.8.5.custom.css" rel="stylesheet" />    
+        <link type="text/css" href="css/console.css" rel="stylesheet" />    
+        <script type="text/javascript" src="js/dygraph-combined.min.js"></script>
+        <script type="text/javascript" src="js/jquery-1.4.2.min.js"></script>
+        <script type="text/javascript" src="js/jquery-ui-1.8.5.custom.min.js"></script>
+        <script type="text/javascript" src="js/jquery.hotkeys.js"></script>
+        <script type="text/javascript" src="js/jquery.console.js"></script>
+        <script type="text/javascript" src="js/console.ui.js"></script>
+        <script type="text/javascript" src="js/console.data.js"></script>
+        <script type="text/javascript">
+            $(function(){ 
+                initData();
+                initUI(); 
+
+                if (location.host) {
+                    addNode(location.host);
+                } else {
+                    addNode('localhost:8000');
+                }
+            });
+        </script>
+    </head>
+    <body class="clsDarkBackground"><div id="pnlBackground">
+        <div id="pnlHeader">NODELOAD CONSOLE</div>
+        <div id="pnlMain" class="ui-widget-content ui-corner-all">
+            <div class="clsMainRow">
+                <table style="width: 100%; line-height: 1em"><tr>
+                    <td style="width: 1px; padding-right: 10px"><h2>Nodes:</h2></td>
+                    <td class="ui-widget-content ui-corner-all clsToolbar">
+                        <button id="cmdAddNode">Add Node</button>
+                        <span id="optNodes"> 
+                        </span>
+                        <div id="frmAddNode" class="clsDarkBackground ui-corner-all">
+                            <span>Host:</span>
+                            <input id="txtNewHost" type="text"></input>
+                            <button id="cmdAdd">Add</button>
+                        </div>
+                        <div style="float: right; color: gray;">&lt; k &nbsp;&nbsp; j &gt;</div>
+                    </td>
+                </tr></table>
+            </div>
+            <div class="clsMainRow">
+                <div id="pnlCharts"></div>
+                <div id="pnlRightColumn">
+                    <div>
+                        <h3><a href="#">Overall Statistics</a></h3>
+                        <div id="pnlSummary" class="ui-widget-content ui-corner-all"/>
+                    </div>
+                    <div>
+                        <h3><a href="#">Test Details</a></h3>
+                        <div>
+                            spec: {
+
+                            }
+                        </div>
+                    </div>
+                    <div>
+                        <h3><a href="#">Node Details</a></h3>
+                        <div>Last ping: </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div></body>
+</html>
diff --git a/console/css/console.css b/console/css/console.css
@@ -0,0 +1,90 @@
+body{ 
+    font: 62.5% "Trebuchet MS", sans-serif; 
+}
+
+/* Base elements: background, header, main content panels
+----------------------------------------------------------*/
+.clsDarkBackground{
+    background: #6e4f1c url(pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png) 50% 50% repeat;
+}
+#pnlBackground{
+    padding: 0.5%;
+    height: 100%;
+}
+
+#pnlHeader{
+    -webkit-transform: rotate(-90deg); 
+    -webkit-transform-origin: top left;
+    -moz-transform: rotate(-90deg);
+    position: absolute;
+    top: 11em;
+    font-size: 2em; font-weight: bold;
+    width:auto;
+}
+#pnlMain{
+    float: left;
+    margin-left: 3em;
+    height: 100%;
+    width: 95%;
+    padding: 1em;
+    background: #ffffff;
+}
+.clsMainRow{
+    display: inline-block;
+    margin-bottom: 1em;
+    width:100%;
+}
+
+/* Nodes header bar
+----------------------------------------------------------*/
+.clsToolbar{
+    padding: 0px 6px;
+}
+#frmAddNode{
+    position: absolute;
+    display: none;
+    padding: 5px;
+    z-index: 1;
+}
+
+/* Tabs area
+----------------------------------------------------------*/
+#pnlCharts{
+    float: left;
+    width: 75%; height: 100%;
+}
+.clsChartContainer{
+    position:relative;
+    overflow:hidden;
+    margin-bottom:30px;
+}
+.clsChartLegend{
+    position:absolute;
+    display:block;
+    top:0px;
+    right: 0px; 
+}
+
+/* Summary and details area (right column)
+----------------------------------------------------------*/
+#pnlRightColumn{
+    float: right;
+    width: 24%; height: 100%;
+}
+#pnlSummary{
+    font-size: 1.3em;
+    padding: 0.5em;
+}
+#pnlSummary table{
+    font-variant: small-caps;
+    border-spacing: 10px 1px;
+}
+
+
+/* Miscellaneous
+----------------------------------------------------------*/
+.clsShortcutKeys {
+    float: right;
+    color: gray;
+    margin: 2px 5px 0px 0px;
+}
diff --git a/console/css/pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png b/console/css/pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png
diff --git a/console/css/pepper-grinder/images/ui-bg_diagonal-maze_40_000000_10x10.png b/console/css/pepper-grinder/images/ui-bg_diagonal-maze_40_000000_10x10.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_15_eceadf_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_15_eceadf_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_15_f7f3de_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_15_f7f3de_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_15_ffffff_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_15_ffffff_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_65_654b24_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_65_654b24_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-bg_fine-grain_68_b83400_60x60.png b/console/css/pepper-grinder/images/ui-bg_fine-grain_68_b83400_60x60.png
diff --git a/console/css/pepper-grinder/images/ui-icons_222222_256x240.png b/console/css/pepper-grinder/images/ui-icons_222222_256x240.png
diff --git a/console/css/pepper-grinder/images/ui-icons_3572ac_256x240.png b/console/css/pepper-grinder/images/ui-icons_3572ac_256x240.png
diff --git a/console/css/pepper-grinder/images/ui-icons_8c291d_256x240.png b/console/css/pepper-grinder/images/ui-icons_8c291d_256x240.png
diff --git a/console/css/pepper-grinder/images/ui-icons_b83400_256x240.png b/console/css/pepper-grinder/images/ui-icons_b83400_256x240.png
diff --git a/console/css/pepper-grinder/images/ui-icons_fbdb93_256x240.png b/console/css/pepper-grinder/images/ui-icons_fbdb93_256x240.png
diff --git a/console/css/pepper-grinder/images/ui-icons_ffffff_256x240.png b/console/css/pepper-grinder/images/ui-icons_ffffff_256x240.png