diff --git a/src/kudu/server/server_base.cc b/src/kudu/server/server_base.cc index ae049548c9..c993f659ed 100644 --- a/src/kudu/server/server_base.cc +++ b/src/kudu/server/server_base.cc @@ -12,6 +12,7 @@ #include "kudu/common/wire_protocol.pb.h" #include "kudu/fs/fs_manager.h" #include "kudu/gutil/strings/strcat.h" +#include "kudu/gutil/strings/substitute.h" #include "kudu/gutil/walltime.h" #include "kudu/rpc/messenger.h" #include "kudu/server/default-path-handlers.h" @@ -46,6 +47,7 @@ DECLARE_bool(use_hybrid_clock); using std::string; using std::stringstream; using std::vector; +using strings::Substitute; namespace kudu { namespace server { @@ -269,6 +271,12 @@ void ServerBase::MetricsLoggingThread() { WARN_NOT_OK(log.Close(), "Unable to close metric log"); } +std::string ServerBase::FooterHtml() const { + return Substitute("
$0\nserver uuid $1
", + VersionInfo::GetShortVersionString(), + instance_pb_->permanent_uuid()); +} + Status ServerBase::Start() { GenerateInstanceID(); @@ -281,6 +289,7 @@ Status ServerBase::Start() { AddRpczPathHandlers(messenger_, web_server_.get()); RegisterMetricsJsonHandler(web_server_.get(), metric_registry_.get()); TracingPathHandlers::RegisterHandlers(web_server_.get()); + web_server_->set_footer_html(FooterHtml()); RETURN_NOT_OK(web_server_->Start()); if (!options_.dump_info_path.empty()) { diff --git a/src/kudu/server/server_base.h b/src/kudu/server/server_base.h index bdf6bbbaa5..25f41daf19 100644 --- a/src/kudu/server/server_base.h +++ b/src/kudu/server/server_base.h @@ -106,6 +106,7 @@ class ServerBase { const std::string& format) const; Status StartMetricsLogging(); void MetricsLoggingThread(); + std::string FooterHtml() const; ServerBaseOptions options_; diff --git a/src/kudu/server/webserver.cc b/src/kudu/server/webserver.cc index 8ccbf6b58e..ed4fb15661 100644 --- a/src/kudu/server/webserver.cc +++ b/src/kudu/server/webserver.cc @@ -260,7 +260,7 @@ int Webserver::BeginRequestCallback(struct sq_connection* connection, struct sq_request_info* request_info) { PathHandler* handler; { - boost::shared_lock lock(path_handlers_lock_); + boost::shared_lock lock(lock_); PathHandlerMap::const_iterator it = path_handlers_.find(request_info->uri); if (it == path_handlers_.end()) { // Let Mongoose deal with this request; returning NULL will fall through @@ -359,7 +359,7 @@ int Webserver::RunPathHandler(const PathHandler& handler, void Webserver::RegisterPathHandler(const string& path, const string& alias, const PathHandlerCallback& callback, bool is_styled, bool is_on_nav_bar) { - boost::lock_guard lock(path_handlers_lock_); + boost::lock_guard lock(lock_); PathHandlerMap::iterator it = path_handlers_.find(path); if (it == path_handlers_.end()) { it = path_handlers_.insert( @@ -371,17 +371,11 @@ void Webserver::RegisterPathHandler(const string& path, const string& alias, const char* const PAGE_HEADER = "" " " " Cloudera Kudu" -" " -" " +" " +" " " " " "; -static const char* const PAGE_FOOTER = ""; - static const char* const NAVIGATION_BAR_PREFIX = "
" "
" @@ -422,8 +416,20 @@ bool Webserver::static_pages_available() const { return !opts_.doc_root.empty() && opts_.enable_doc_root; } +void Webserver::set_footer_html(const std::string& html) { + boost::lock_guard l(lock_); + footer_html_ = html; +} + void Webserver::BootstrapPageFooter(stringstream* output) { - (*output) << PAGE_FOOTER; + boost::shared_lock l(lock_); + *output << "
\n"; // end bootstrap 'container' div + if (!footer_html_.empty()) { + *output << "
"; + *output << footer_html_; + *output << "
"; + } + *output << ""; } } // namespace kudu diff --git a/src/kudu/server/webserver.h b/src/kudu/server/webserver.h index edb00ae6e2..5439374423 100644 --- a/src/kudu/server/webserver.h +++ b/src/kudu/server/webserver.h @@ -57,6 +57,9 @@ class Webserver : public WebCallbackRegistry { const PathHandlerCallback& callback, bool is_styled = true, bool is_on_nav_bar = true) OVERRIDE; + // Change the footer HTML to be displayed at the bottom of all styled web pages. + void set_footer_html(const std::string& html); + // True if serving all traffic over SSL, false otherwise bool IsSecure() const; private: @@ -128,8 +131,8 @@ class Webserver : public WebCallbackRegistry { const WebserverOptions opts_; - // Lock guarding the path_handlers_ map - boost::shared_mutex path_handlers_lock_; + // Lock guarding the path_handlers_ map and footer_html. + boost::shared_mutex lock_; // Map of path to a PathHandler containing a list of handlers for that // path. More than one handler may register itself with a path so that many @@ -137,6 +140,10 @@ class Webserver : public WebCallbackRegistry { typedef std::map PathHandlerMap; PathHandlerMap path_handlers_; + // Snippet of HTML which will be displayed in the footer of all pages + // rendered by this server. Protected by 'lock_'. + std::string footer_html_; + // The address of the interface on which to run this webserver. std::string http_address_; diff --git a/www/kudu.css b/www/kudu.css new file mode 100644 index 0000000000..ec2f44b711 --- /dev/null +++ b/www/kudu.css @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2015, Cloudera, inc. + * Confidential Cloudera Information: Covered by NDA. + */ + +body { + padding-top: 60px; +} + +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; + background-color: #f5f5f5; +} +.footer pre { + border: none; +}