You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/05/15 21:12:19 UTC
svn commit: r1338838 [11/11] - in /incubator/mesos/trunk/src: local/ master/
webui/master/static/ webui/master/static/bootstrap/
webui/master/static/bootstrap/css/ webui/master/static/bootstrap/ico/
webui/master/static/bootstrap/img/ webui/master/stati...
Added: incubator/mesos/trunk/src/webui/master/static/dashboard.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/dashboard.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/dashboard.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/dashboard.html Tue May 15 19:12:15 2012
@@ -0,0 +1,9 @@
+<div class="alert">
+ <button class="close" data-dismiss="alert">Ã</button>
+ Expand a horizon by <strong>clicking</strong> on it, contract it
+ via <strong>shift+click</strong>.
+</div>
+
+<!-- <div class="well" id="graph"></div> -->
+
+<div id="graphs"></div>
Added: incubator/mesos/trunk/src/webui/master/static/dashboard.js
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/dashboard.js?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/dashboard.js (added)
+++ incubator/mesos/trunk/src/webui/master/static/dashboard.js Tue May 15 19:12:15 2012
@@ -0,0 +1,149 @@
+var horizons = {
+ create: function(context, name, metric, extent, units) {
+ // Add a "graph-container".
+ d3.select("#graphs")
+ .append("div")
+ .attr("id", name + "-container")
+ .attr("class", "graph-container");
+
+ // Add a header.
+ d3.select("#" + name + "-container")
+ .append("h4")
+ .text(name);
+
+ // Add a "graph".
+ d3.select("#" + name + "-container")
+ .append("div")
+ .attr("id", name)
+ .attr("class", "graph");
+
+ // Add the bottom axis.
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .append("div")
+ .attr("id", "bottom-axis")
+ .attr("class", "bottom axis")
+ .call(context.axis().ticks(12).orient("bottom"));
+
+ // Add the rule.
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .append("div")
+ .attr("class", "rule")
+ .call(context.rule());
+
+ var horizon = context.horizon()
+ .title(name)
+ .height(30)
+ .extent(extent)
+ .metric(metric)
+ .format(function (value) { return d3.format(".3g")(value) + " " + units; });
+
+ function clicked(datum, index) {
+ // Remove the graph from the dashboard.
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .select("#" + name + "-horizon")
+ .call(horizon.remove)
+ .remove();
+
+ // Now increase it or decrease it.
+ if (!d3.event.shiftKey) {
+ // Increase size.
+ horizon = context.horizon()
+ .height(horizon.height() * 2)
+ .extent([horizon.extent()[0] * 2, horizon.extent()[1] * 2])
+ .metric(metric)
+ .format(function (value) { return d3.format(".3g")(value) + " " + units; });
+ horizon(
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .insert("div", ".bottom")
+ .attr("class", "horizon")
+ .attr("id", name + "-horizon")
+ .style("cursor", "pointer")
+ .on("click", clicked));
+ } else {
+ // Decrease size.
+ horizon = context.horizon()
+ .height(horizon.height() / 2)
+ .extent([horizon.extent()[0] / 2, horizon.extent()[1] / 2])
+ .metric(metric)
+ .format(function (value) { return d3.format(".3g")(value) + " " + units; });
+ horizon(
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .insert("div", ".bottom")
+ .attr("class", "horizon")
+ .attr("id", name + "-horizon")
+ .style("cursor", "pointer")
+ .on("click", clicked));
+ }
+ }
+
+ horizon(
+ d3.select("#" + name + "-container")
+ .select("#" + name)
+ .insert("div", ".bottom")
+ .attr("class", "horizon")
+ .attr("id", name + "-horizon")
+ .style("cursor", "pointer")
+ .on("click", clicked));
+
+ context.on("focus", function(i) {
+ d3.selectAll(".value").style("right", i == null ? null : context.size() - i + "px");
+ });
+
+ return context;
+ }
+}
+
+
+function metric_cpus(context) {
+ return context.metric(function(start, stop, step, callback) {
+ // Convert the start and stop "dates" into milliseconds.
+ start = +start, stop = +stop;
+
+ var values = [];
+ _((stop - start) / step).times(function() {
+ values.push(4);
+ });
+
+ // Return the data requested.
+ callback(null, values);
+ }, "cpus");
+}
+
+
+function metric_mem(context) {
+ return context.metric(function(start, stop, step, callback) {
+ // Convert the start and stop "dates" into milliseconds.
+ start = +start, stop = +stop;
+
+ var values = [];
+ _((stop - start) / step).times(function() {
+ values.push(34);
+ });
+
+ // Return the data requested.
+ callback(null, values);
+ }, "mem");
+}
+
+
+function random(context, name) {
+ var value = 0,
+ values = [],
+ i = 0,
+ last;
+ return context.metric(function(start, stop, step, callback) {
+ start = +start, stop = +stop;
+ if (isNaN(last)) last = start;
+ while (last < stop) {
+ last += step;
+ value = Math.abs(value + .8 * Math.random() - .4 + .2 * Math.cos(i += .2));
+ values.push(value);
+ }
+ callback(null, values = values.slice((start - stop) / step));
+ }, name);
+}
\ No newline at end of file
Added: incubator/mesos/trunk/src/webui/master/static/framework.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/framework.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/framework.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/framework.html Tue May 15 19:12:15 2012
@@ -0,0 +1,89 @@
+<ul class="breadcrumb">
+ <li>
+ <a href="#">Home</a> <span class="divider">/</span>
+ </li>
+ <li>
+ <a href="#/frameworks">Frameworks</a> <span class="divider">/</span>
+ </li>
+ <li class="active">
+ {{framework.name}}
+ <em>({{framework.id}})</em>
+ </li>
+</ul>
+
+<div class="alert hide" id="terminated-alert">
+ <button class="close" data-dismiss="alert">Ã</button>
+ <strong>This framework has terminated!</strong>
+</div>
+
+<div class="alert hide" id="missing-alert">
+ <button class="close" data-dismiss="alert">Ã</button>
+ <strong>No framework by that ID could be found!</strong>
+</div>
+
+<div class="row hide" id="framework">
+ <div class="span3">
+ <div class="well">
+ <dl class="inline clearfix">
+ <dt>Name:</dt>
+ <dd>{{framework.name}}</dd>
+ <dt>ID:</dt>
+ <dd>{{framework.id}}</dd>
+ <dt>User:</dt>
+ <dd>{{framework.user}}</dd>
+ <dt>Registered:</dt>
+ <dd>{{framework.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</dd>
+ <dt>Re-registered:</dt>
+ <dd>{{framework.reregistered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</dd>
+ <dt>Active tasks:</dt>
+ <dd>{{framework.tasks.length}}</dd>
+ <dt>CPUs:</dt>
+ <dd>{{framework.resources.cpus}}</dd>
+ <dt>Mem:</dt>
+ <dd>{{framework.resources.mem / 1024}} GB</dd>
+ </dl>
+ </div>
+ </div>
+
+ <div class="span9">
+ <h2 id="frameworks">Active Tasks</h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Name</th>
+ <th>State</th>
+ <th>Slave</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="task in framework.tasks">
+ <td>{{task.id}}</td>
+ <td>{{task.name}}</td>
+ <td>{{task.state}}</td>
+ <td>{{task.slave_id}}</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h2 id="frameworks">Terminated Tasks</h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Name</th>
+ <th>State</th>
+ <th>Slave</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="task in framework.completed_tasks">
+ <td>{{task.id}}</td>
+ <td>{{task.name}}</td>
+ <td>{{task.state}}</td>
+ <td>{{task.slave_id}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
Added: incubator/mesos/trunk/src/webui/master/static/frameworks.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/frameworks.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/frameworks.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/frameworks.html Tue May 15 19:12:15 2012
@@ -0,0 +1,42 @@
+<ul class="breadcrumb">
+ <li>
+ <a href="#">Home</a> <span class="divider">/</span>
+ </li>
+ <li class="active">
+ Frameworks
+ </li>
+</ul>
+
+<div class="row">
+ <div class="span12">
+ <h2 id="frameworks">Frameworks</h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>User</th>
+ <th>Name</th>
+ <th>Active Tasks</th>
+ <th>CPUs</th>
+ <th>Mem</th>
+ <th>Max Share</th>
+ <th>Registered</th>
+ <th>Reregistered</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="framework in frameworks">
+ <td>{{framework.id}}</td>
+ <td>{{framework.user}}</td>
+ <td><a href="{{'#/framework/' + framework.id}}">{{framework.name}}</a></td>
+ <td>{{framework.tasks.length}}</td>
+ <td>{{framework.resources.cpus}}</td>
+ <td>{{framework.resources.mem / 1024}} GB</td>
+ <td>{{framework.max_share * 100}}%</td>
+ <td>{{framework.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ <td>{{framework.reregistered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
Added: incubator/mesos/trunk/src/webui/master/static/graph.css
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/graph.css?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/graph.css (added)
+++ incubator/mesos/trunk/src/webui/master/static/graph.css Tue May 15 19:12:15 2012
@@ -0,0 +1,100 @@
+.graph-container {
+ position: relative;
+ overflow: hidden;
+}
+.graph {
+ float: right;
+}
+
+/* The rest of this file is taken from square.github.com/cubism. */
+.group {
+ margin-bottom: 1em;
+}
+
+.axis {
+ font: 10px sans-serif;
+ position: fixed;
+ pointer-events: none;
+ z-index: 2;
+}
+
+.axis text {
+ -webkit-transition: fill-opacity 250ms linear;
+}
+
+.axis path {
+ display: none;
+}
+
+.axis line {
+ stroke: #000;
+ shape-rendering: crispEdges;
+}
+
+.axis.top {
+ background-image: linear-gradient(top, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -moz-linear-gradient(top, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -webkit-linear-gradient(top, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -ms-linear-gradient(top, #fff 0%, rgba(255,255,255,0) 100%);
+ top: 0px;
+ padding: 0 0 24px 0;
+}
+
+.axis.bottom {
+ background-image: linear-gradient(bottom, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -o-linear-gradient(bottom, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -moz-linear-gradient(bottom, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -webkit-linear-gradient(bottom, #fff 0%, rgba(255,255,255,0) 100%);
+ background-image: -ms-linear-gradient(bottom, #fff 0%, rgba(255,255,255,0) 100%);
+ bottom: 0px;
+ padding: 24px 0 0 0;
+}
+
+.horizon {
+ border-bottom: solid 1px #000;
+ overflow: hidden;
+ position: relative;
+}
+
+.horizon {
+ border-top: solid 1px #000;
+ border-bottom: solid 1px #000;
+}
+
+.horizon + .horizon {
+ border-top: none;
+}
+
+.horizon canvas {
+ display: block;
+}
+
+.horizon .title,
+.horizon .value {
+ bottom: 0;
+ line-height: 30px;
+ margin: 0 6px;
+ position: absolute;
+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
+ white-space: nowrap;
+}
+
+.horizon .title {
+ left: 0;
+}
+
+.horizon .value {
+ right: 0;
+}
+
+.line {
+ background: #000;
+ opacity: .2;
+ z-index: 2;
+}
+
+@media all and (max-width: 1439px) {
+ .axis { position: static; }
+ .axis.top, .axis.bottom { padding: 0; }
+}
Added: incubator/mesos/trunk/src/webui/master/static/home.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/home.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/home.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/home.html Tue May 15 19:12:15 2012
@@ -0,0 +1,167 @@
+<div class="row">
+ <div class="span3">
+ <div class="well">
+ <dl class="inline clearfix">
+ <dt>Server:</dt>
+ <dd>{{state.pid.split("@")[1]}}</dd>
+ <dt>Built:</dt>
+ <dd>{{state.build_date}} by <i>{{state.build_user}}</i></dd>
+ <dt>Started:</dt>
+ <dd>{{state.start_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</dd>
+ <dt>ID:</dt>
+ <dd>{{state.id}}</dd>
+ </dl>
+
+ <h2>Resources</h2>
+ <table class="table table-condensed">
+ <thead>
+ <tr>
+ <th></th>
+ <th>CPUs</th>
+ <th>Memory</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th>Total</th>
+ <td>{{total_cpus}}</td>
+ <td>{{total_mem / 1024}} GB</td>
+ </tr>
+ <tr>
+ <th>Used</th>
+ <td>{{used_cpus}}</td>
+ <td>{{used_mem / 1024}} GB</td>
+ </tr>
+ <tr>
+ <th>Offered</th>
+ <td>{{offered_cpus}}</td>
+ <td>{{offered_mem / 1024}} GB</td>
+ </tr>
+ <tr>
+ <th>Idle</th>
+ <td>{{idle_cpus}}</td>
+ <td>{{idle_mem / 1024}} GB</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="span9">
+ <h2>
+ Active Frameworks
+ <small>(<a href="#/frameworks">see all</a>)</small>
+ </h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>User</th>
+ <th>Name</th>
+ <th>Active Tasks</th>
+ <th>CPUs</th>
+ <th>Mem</th>
+ <th>Max Share</th>
+ <th>Registered</th>
+ <th>Reregistered</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="framework in frameworks">
+ <td>
+ <abbr title="{{framework.id}}">{{framework.id | truncateMesosID}}</abbr>
+ </td>
+ <td>{{framework.user}}</td>
+ <td><a href="{{'#/framework/' + framework.id}}">{{framework.name}}</a></td>
+ <td>{{framework.tasks.length}}</td>
+ <td>{{framework.resources.cpus}}</td>
+ <td>{{framework.resources.mem / 1024}} GB</td>
+ <td>{{framework.max_share * 100}}%</td>
+ <td>{{framework.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ <td>{{framework.reregistered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <h2>
+ Active Slaves
+ <small>(<a href="#/slaves">see all</a>)</small>
+ </h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Host</th>
+ <th>CPUs</th>
+ <th>Mem</th>
+ <th>Connected at</th>
+ </tr>
+ </thead>
+ <tr ng-repeat="slave in state.slaves">
+ <td>
+ <abbr title="{{slave.id}}">{{slave.id | truncateMesosID}}</abbr>
+ </td>
+ <td>
+ <a href="http://{{slave.webui_hostname}}:{{slave.webui_port}}/">
+ {{slave.hostname}}
+ </a>
+ </td>
+ <td>{{slave.resources.cpus}}</td>
+ <td>{{slave.resources.mem / 1024}} GB</td>
+ <td>{{slave.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ </tr>
+ </table>
+
+ <h2>Offers</h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Framework</th>
+ <th>Host</th>
+ <th>Resources</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="offer in offers">
+ <td>
+ <abbr title="{{offer.id}}">{{offer.id | truncateMesosID}}</abbr>
+ </td>
+ <td><a href="{{'#/framework/' + offer.framework_id}}">{{frameworks[offer.framework_id].name}}</a></td>
+ <td>
+ <a href="http://{{slaves[offer.slave_id].webui_hostname}}:{{slaves[offer.slave_id].webui_port}}/">
+ {{slaves[offer.slave_id].hostname}}
+ </a>
+ </td>
+ <td>{{offer.resources}}</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h2>Terminated Frameworks</h2>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>User</th>
+ <th>Name</th>
+ <th>Registered</th>
+ <th>Unregistered</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="framework in completed_frameworks">
+ <td>
+ <abbr title="{{framework.id}}">{{framework.id | truncateMesosID}}</abbr>
+ </td>
+ <td>{{framework.user}}</td>
+ <td><a href="{{'#/framework/' + framework.id}}">{{framework.name}}</a></td>
+ <td>{{framework.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ <td>{{framework.unregistered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ </tr>
+ </tbody>
+ </table>
+
+ </div>
+</div>
Added: incubator/mesos/trunk/src/webui/master/static/index.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/index.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/index.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/index.html Tue May 15 19:12:15 2012
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en" ng-app="mesos">
+ <head>
+ <meta charset="utf-8">
+ <title>Mesos</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- styles -->
+ <link href="/static/bootstrap/css/bootstrap.css" rel="stylesheet">
+ <link href="/static/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+
+ <link href="/static/mesos.css" rel="stylesheet">
+ <link href="/static/graph.css" rel="stylesheet">
+
+ <script src="/static/bootstrap/js/jquery.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-transition.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-alert.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-modal.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-dropdown.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-scrollspy.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-tab.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-tooltip.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-popover.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-button.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-collapse.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-carousel.js"></script>
+ <script src="/static/bootstrap/js/bootstrap-typeahead.js"></script>
+
+ <script src="/static/underscore-min.js"></script>
+ <script src="/static/angular-1.0.0rc8.js"></script>
+ <script src="/static/d3.v2.js"></script>
+ <script src="/static/cubism.v1.js"></script>
+
+ <script src="/static/app.js"></script>
+ <script src="/static/controllers.js"></script>
+ <script src="/static/dashboard.js"></script>
+
+ <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- fav and touch icons -->
+ <link rel="shortcut icon" href="/static/bootstrap/ico/favicon.ico">
+ </head>
+
+ <body>
+
+ <div class="navbar navbar-fixed-top" id="navbar">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">Mesos</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li data-tabname="home"><a href="#">Home</a></li>
+ <li data-tabname="dashboard"><a href="#/dashboard">Dashboard</a></li>
+ <li data-tabname="log"><a href="#/log">Log</a></li>
+ <li data-tabname="frameworks"><a href="#/frameworks">Frameworks</a></li>
+ <li data-tabname="slaves"><a href="#/slaves">Slaves</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
+
+ <div ng-controller="MainCntl">
+
+ <div class="container">
+ <div ng-view></div>
+ </div>
+
+ <div class="modal hide fade" style="display: none;" id="error-modal">
+ <div class="modal-header">
+ <button class="close" data-dismiss="modal">Ã</button>
+ <h3>Failed to connect to {{$location.host()}}:{{$location.port()}}!</h3>
+ </div>
+ <div class="modal-body">
+ <p>
+ Retrying in <b>{{retry / 1000}}</b> seconds ...
+ <a href="{{$location.path()}}" data-dismiss="modal">try now</a>.
+ </p>
+ </div>
+ <div class="modal-footer">
+ </div>
+ </div>
+
+ </div>
+
+ </body>
+</html>
+
+
+<!-- <div class="container" id="main_content"></div> -->
Added: incubator/mesos/trunk/src/webui/master/static/log.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/log.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/log.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/log.html Tue May 15 19:12:15 2012
@@ -0,0 +1,8 @@
+<div class="alert hide" id="log-not-found-alert">
+ <button class="close" data-dismiss="alert">Ã</button>
+ <strong>Logging to a file is not enabled, please set the 'log_dir' option.</strong>
+</div>
+
+<div>
+ <pre id="log"></pre>
+</div>
Added: incubator/mesos/trunk/src/webui/master/static/mesos.css
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/mesos.css?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/mesos.css (added)
+++ incubator/mesos/trunk/src/webui/master/static/mesos.css Tue May 15 19:12:15 2012
@@ -0,0 +1,19 @@
+body {
+ padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+}
+
+dl.inline dt, dl.inline dd {
+ float: left;
+}
+
+dl.inline dd + dt, dl.inline dd + dd {
+ clear: left
+}
+
+dl.inline dd + dd {
+ float: none
+}
+
+dl.inline dt {
+ font-weight: bold
+}
\ No newline at end of file
Added: incubator/mesos/trunk/src/webui/master/static/slaves.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/slaves.html?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/slaves.html (added)
+++ incubator/mesos/trunk/src/webui/master/static/slaves.html Tue May 15 19:12:15 2012
@@ -0,0 +1,23 @@
+<h2>Active Slaves</h2>
+<table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Host</th>
+ <th>CPUs</th>
+ <th>Mem</th>
+ <th>Connected at</th>
+ </tr>
+ </thead>
+ <tr ng-repeat="slave in state.slaves">
+ <td>{{slave.id}}</td>
+ <td>
+ <a href="http://{{slave.webui_hostname}}:{{slave.webui_port}}/">
+ {{slave.hostname}}
+ </a>
+ </td>
+ <td>{{slave.resources.cpus}}</td>
+ <td>{{slave.resources.mem / 1024}} GB</td>
+ <td>{{slave.registered_time * 1000 | date:"MM/dd/yyyy H:mm:ss"}}</td>
+ </tr>
+</table>
Added: incubator/mesos/trunk/src/webui/master/static/underscore-min.js
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/underscore-min.js?rev=1338838&view=auto
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/underscore-min.js (added)
+++ incubator/mesos/trunk/src/webui/master/static/underscore-min.js Tue May 15 19:12:15 2012
@@ -0,0 +1,32 @@
+// Underscore.js 1.3.3
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
+c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break;
+g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a,
+c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===o)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===o)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.map===z)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(A&&
+a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,
+c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,
+a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
+function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&
+(e={value:a,computed:b})});return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){d=Math.floor(Math.random()*(f+1));b[f]=b[d];b[d]=a});return b};b.sortBy=function(a,c,d){var e=b.isFunction(c)?c:function(a){return a[c]};return b.pluck(b.map(a,function(a,b,c){return{value:a,criteria:e.call(d,a,b,c)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c===void 0?1:d===void 0?-1:c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};
+j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:b.isArray(a)||b.isArguments(a)?i.call(a):a.toArray&&b.isFunction(a.toArray)?a.toArray():b.values(a)};b.size=function(a){return b.isArray(a)?a.length:b.keys(a).length};b.first=b.head=b.take=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,
+0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,
+e=[];a.length<3&&(c=true);b.reduce(d,function(d,g,h){if(c?b.last(d)!==g||!d.length:!b.include(d,g)){d.push(g);e.push(a[h])}return d},[]);return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=
+i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d){d=b.sortedIndex(a,c);return a[d]===c?d:-1}if(q&&a.indexOf===q)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(F&&a.lastIndexOf===F)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){if(arguments.length<=
+1){b=a||0;a=0}for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;){g[f++]=a;a=a+d}return g};var H=function(){};b.bind=function(a,c){var d,e;if(a.bind===t&&t)return t.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));H.prototype=a.prototype;var b=new H,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=
+i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(null,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i,j=b.debounce(function(){h=
+g=false},c);return function(){d=this;e=arguments;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);j()},c));g?h=true:i=a.apply(d,e);j();g=true;return i}};b.debounce=function(a,b,d){var e;return function(){var f=this,g=arguments;d&&!e&&a.apply(f,g);clearTimeout(e);e=setTimeout(function(){e=null;d||a.apply(f,g)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));
+return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&
+c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=
+function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"};
+b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,
+b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId=
+function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape||
+u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c};
+b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d,
+this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);