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/08/20 19:59:54 UTC
svn commit: r1375150 - in /incubator/mesos/trunk/src: master/flags.hpp
master/http.cpp webui/master/static/home.html webui/master/static/index.html
Author: benh
Date: Mon Aug 20 17:59:54 2012
New Revision: 1375150
URL: http://svn.apache.org/viewvc?rev=1375150&view=rev
Log:
Adding 'cluster' flag, to be displayed in the webui (contributed by
Ben Mahler, https://reviews.apache.org/r/6648).
Modified:
incubator/mesos/trunk/src/master/flags.hpp
incubator/mesos/trunk/src/master/http.cpp
incubator/mesos/trunk/src/webui/master/static/home.html
incubator/mesos/trunk/src/webui/master/static/index.html
Modified: incubator/mesos/trunk/src/master/flags.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/flags.hpp?rev=1375150&r1=1375149&r2=1375150&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/flags.hpp (original)
+++ incubator/mesos/trunk/src/master/flags.hpp Mon Aug 20 17:59:54 2012
@@ -65,6 +65,11 @@ public:
"batch_seconds",
"Seconds to wait between batch allocations",
1.0);
+
+ add(&Flags::cluster,
+ "cluster",
+ "Human readable name for the cluster,\n"
+ "displayed in the webui");
}
bool root_submissions;
@@ -73,6 +78,7 @@ public:
uint16_t webui_port;
std::string whitelist;
double batch_seconds;
+ Option<std::string> cluster;
};
} // namespace mesos {
Modified: incubator/mesos/trunk/src/master/http.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/http.cpp?rev=1375150&r1=1375149&r2=1375150&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/http.cpp (original)
+++ incubator/mesos/trunk/src/master/http.cpp Mon Aug 20 17:59:54 2012
@@ -290,6 +290,10 @@ Future<Response> state(
object.values["id"] = master.info.id();
object.values["pid"] = string(master.self());
+ if (master.flags.cluster.isSome()) {
+ object.values["cluster"] = master.flags.cluster.get();
+ }
+
// TODO(benh): Use an Option for the leader PID.
if (master.leader != UPID()) {
object.values["leader"] = string(master.leader);
Modified: 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=1375150&r1=1375149&r2=1375150&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/home.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/home.html Mon Aug 20 17:59:54 2012
@@ -14,6 +14,8 @@
<div class="span3">
<div class="well">
<dl class="inline clearfix">
+ <dt>Cluster:</dt>
+ <dd>{{state.cluster}}</dd>
<dt>Server:</dt>
<dd>{{state.pid.split("@")[1]}}</dd>
<dt>Built:</dt>
Modified: 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=1375150&r1=1375149&r2=1375150&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/index.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/index.html Mon Aug 20 17:59:54 2012
@@ -29,28 +29,31 @@
<p>Loading ...</p>
</div>
- <div class="navbar navbar-fixed-top hide" 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="frameworks"><a href="#/frameworks">Frameworks</a></li>
- <li data-tabname="slaves"><a href="#/slaves">Slaves</a></li>
- </ul>
- </div><!--/.nav-collapse -->
+ <div ng-controller="MainCntl">
+
+ <div class="navbar navbar-fixed-top hide" 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="frameworks"><a href="#/frameworks">Frameworks</a></li>
+ <li data-tabname="slaves"><a href="#/slaves">Slaves</a></li>
+ </ul>
+ <ul class="nav pull-right">
+ <li><p class="navbar-text">{{state.cluster}}</p></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
</div>
</div>
- </div>
-
- <div ng-controller="MainCntl">
<div class="container">
<div class="alert hide" id="no-leader-alert">