Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pybind/mgr/dashboard: add url_prefix #17119

Merged
merged 3 commits into from Aug 29, 2017
Merged

pybind/mgr/dashboard: add url_prefix #17119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d285ff
pybind/mgr/dashboard: add url_prefix
nrdmn Aug 21, 2017
f512ac3
pybind/mgr/dashboard: clean up
nrdmn Aug 22, 2017
7a54520
pybind/mgr/dashboard: updated favicon (old one was 404)
nrdmn Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion doc/mgr/dashboard.rst
View file
Open in desktop
Expand Up @@ -39,6 +39,13 @@ If the port is not configured, the web app will bind to port ``7000``.
If the address it not configured, the web app will bind to ``::``,
which corresponds to all available IPv4 and IPv6 addresses.

You can configure a prefix for all URLs::

ceph config-key set mgr/dashboard/url_prefix $PREFIX

so you can access the dashboard at ``http://$IP:$PORT/$PREFIX/``.


Load balancer
-------------

Expand All @@ -48,4 +55,5 @@ manager is active (e.g., ``ceph mgr dump``). In order to make the
dashboard available via a consistent URL regardless of which manager
daemon is currently active, you may want to set up a load balancer
front-end to direct traffic to whichever manager endpoint is
available.
available. If you use a reverse http proxy that forwards a subpath to
the dashboard, you need to configure ``url_prefix`` (see above).
121 changes: 22 additions & 99 deletions src/pybind/mgr/dashboard/base.html
View file
Open in desktop
Expand Up @@ -9,27 +9,27 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
name="viewport">
<link rel="stylesheet"
href="/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.min.css">
href="{{ url_prefix }}/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<link rel="stylesheet"
href="/static/AdminLTE-2.3.7/dist/css/AdminLTE.min.css">
href="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/css/AdminLTE.min.css">
<link rel="stylesheet"
href="/static/AdminLTE-2.3.7/dist/css/skins/skin-blue.min.css">
href="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/css/skins/skin-blue.min.css">
<link rel="stylesheet"
href="/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.css">
href="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.css">

<script src="/static/AdminLTE-2.3.7/plugins/jQuery/jquery-2.2.3.min.js"></script>
<script src="/static/AdminLTE-2.3.7/plugins/sparkline/jquery.sparkline.min.js"></script>
<script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/jQuery/jquery-2.2.3.min.js"></script>
<script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/sparkline/jquery.sparkline.min.js"></script>

<script src="/static/rivets.bundled.min.js"></script>
<script src="/static/underscore-min.js"></script>
<script src="{{ url_prefix }}/static/rivets.bundled.min.js"></script>
<script src="{{ url_prefix }}/static/underscore-min.js"></script>

<script src="/static/AdminLTE-2.3.7/bootstrap/js/bootstrap.min.js"></script>
<script src="/static/AdminLTE-2.3.7/dist/js/app.min.js"></script>
<script src="/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="{{ url_prefix }}/static/AdminLTE-2.3.7/bootstrap/js/bootstrap.min.js"></script>
<script src="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/js/app.min.js"></script>
<script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"></script>
Expand All @@ -42,7 +42,7 @@
var refresh_interval = 5000;

var refresh = function() {
$.get("/toplevel_data", function(data) {
$.get("{{ url_prefix }}/toplevel_data", function(data) {
_.extend(toplevel_data, data);
setTimeout(refresh, refresh_interval);
});
Expand Down Expand Up @@ -154,8 +154,8 @@
});
</script>

<link rel="shortcut icon" href="http://ceph.com/wp-content/themes/ceph/favicon.ico">
<link rel="shortcut icon" href="/static/favicon.ico">
<link rel="shortcut icon" href="https://ceph.com/wp-content/themes/cephTheme/Resources/Favicons/favicon-96x96.png">
<link rel="shortcut icon" href="{{ url_prefix }}/static/favicon.ico">

<style>
div.box {
Expand Down Expand Up @@ -292,13 +292,13 @@
<!-- Main Header -->
<header class="main-header">
<!-- Logo -->
<a href="/" class="logo">
<a href="{{ url_prefix }}/" class="logo">
<span class="logo-lg">
<img src="/static/Ceph_Logo_Standard_RGB_White_120411_fa.png"
<img src="{{ url_prefix }}/static/Ceph_Logo_Standard_RGB_White_120411_fa.png"
width="123px" height="34px"/>
</span>
<span class="logo-mini">
<img src="/static/logo-mini.png"
<img src="{{ url_prefix }}/static/logo-mini.png"
width="34px" height="34px"/>
</span>
</a>
Expand Down Expand Up @@ -336,7 +336,7 @@
<ul class="sidebar-menu">
<!-- Optionally, you can add icons to the links -->
<li class="{%if path_info=='/' or path_info.startswith('/health')%}active{%endif%}">
<a href="/health">
<a href="{{ url_prefix }}/health">
<i class="fa fa-heartbeat" rv-style="health_status | health_color"></i>
<span>Cluster health</span></a>
</li>
Expand All @@ -348,10 +348,10 @@
</a>
<ul class="treeview-menu menu-open">
<li>
<a href="/servers">Servers</a>
<a href="{{ url_prefix }}/servers">Servers</a>
</li>
<li>
<a href="/osd">OSDs</a>
<a href="{{ url_prefix }}/osd">OSDs</a>
</li>
</ul>
</li>
Expand All @@ -364,7 +364,7 @@
</a>
<ul class="treeview-menu menu-open">
<li>
<a href="/rbd_mirroring">
<a href="{{ url_prefix }}/rbd_mirroring">
<i class="fa fa-exchange"></i> Mirroring
<span class="pull-right-container">
<small rv-hide="rbd_mirroring.warnings | hide_count_box" class="label pull-right bg-yellow">{rbd_mirroring.warnings}</small>
Expand All @@ -373,7 +373,7 @@
</a>
</li>
<li>
<a href="/rbd_iscsi">
<a href="{{ url_prefix }}/rbd_iscsi">
<i class="fa fa-upload"></i> iSCSI
<span class="pull-right-container" />
</a>
Expand Down Expand Up @@ -430,83 +430,6 @@
<strong>Copyright &copy; 2016 by Ceph Contributors.</strong> Free software (LGPL 2.1)
</footer>

<!-- Control Sidebar -->
<aside class="control-sidebar control-sidebar-dark">
<!-- Create the tabs -->
<ul class="nav nav-tabs nav-justified control-sidebar-tabs">
<li class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-home"></i></a></li>
<li><a href="#control-sidebar-settings-tab" data-toggle="tab"><i class="fa fa-gears"></i></a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<!-- Home tab content -->
<div class="tab-pane active" id="control-sidebar-home-tab">
<h3 class="control-sidebar-heading">Recent Activity</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript::;">
<i class="menu-icon fa fa-birthday-cake bg-red"></i>

<div class="menu-info">
<h4 class="control-sidebar-subheading">Langdon's Birthday</h4>

<p>Will be 23 on April 24th</p>
</div>
</a>
</li>
</ul>
<!-- /.control-sidebar-menu -->

<h3 class="control-sidebar-heading">Tasks Progress</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript::;">
<h4 class="control-sidebar-subheading">
Custom Template Design
<span class="pull-right-container">
<span class="label label-danger pull-right">70%</span>
</span>
</h4>

<div class="progress progress-xxs">
<div class="progress-bar progress-bar-danger" style="width: 70%"></div>
</div>
</a>
</li>
</ul>
<!-- /.control-sidebar-menu -->

</div>
<!-- /.tab-pane -->
<!-- Stats tab content -->
<div class="tab-pane" id="control-sidebar-stats-tab">Stats Tab Content</div>
<!-- /.tab-pane -->
<!-- Settings tab content -->
<div class="tab-pane" id="control-sidebar-settings-tab">
<form method="post">
<h3 class="control-sidebar-heading">General Settings</h3>

<div class="form-group">
<label class="control-sidebar-subheading">
Report panel usage
<input type="checkbox" class="pull-right" checked>
</label>

<p>
Some information about this general settings option
</p>
</div>
<!-- /.form-group -->
</form>
</div>
<!-- /.tab-pane -->
</div>
</aside>
<!-- /.control-sidebar -->
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class="control-sidebar-bg"></div>

</div>

<!--
Expand Down
2 changes: 1 addition & 1 deletion src/pybind/mgr/dashboard/clients.html
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
var content_data = {{ content_data }};

var refresh = function() {
$.get("/clients_data/" + content_data.fscid + "/", function(data) {
$.get("{{ url_prefix }}/clients_data/" + content_data.fscid + "/", function(data) {
content_data.clients = data;
setTimeout(refresh, 5000);
});
Expand Down
4 changes: 2 additions & 2 deletions src/pybind/mgr/dashboard/filesystem.html
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
var content_data = {{ content_data }};

var refresh = function() {
$.get("/filesystem_data/" + content_data.fs_status.filesystem.id + "/", function(data) {
$.get("{{ url_prefix }}/filesystem_data/" + content_data.fs_status.filesystem.id + "/", function(data) {
_.extend(content_data.fs_status, data);
setTimeout(refresh, 5000);
});
Expand Down Expand Up @@ -71,7 +71,7 @@
var rhs_transform = delta_timeseries;

var draw_chart = function() {
$.get("/mds_counters/" + content_data.fs_status.filesystem.id + "/", function(data) {
$.get("{{ url_prefix }}/mds_counters/" + content_data.fs_status.filesystem.id + "/", function(data) {
var top_chart = true;

// Cull any chart elements that correspond to MDSs no
Expand Down
2 changes: 1 addition & 1 deletion src/pybind/mgr/dashboard/health.html
View file
Open in desktop
Expand Up @@ -210,7 +210,7 @@
rivets.bind($("#content"), content_data);

var refresh = function() {
$.get("/health_data", function(data) {
$.get("{{ url_prefix }}/health_data", function(data) {
_.extend(content_data, data);
draw_usage_charts();
setTimeout(refresh, 5000);
Expand Down