Skip to content

GitLab

emulab-devel
emulab-devel

All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit f3f87811 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files
Options

More work on slothd graphs; now supporting MAX and AVG graphs, and 5 minute 

intervals in the first 24 hours.
parent 95471cfc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 121 deletions
www/aptui/js/adminextend.js
View file @ f3f87811
......@@ -258,7 +258,7 @@ function (_, sup, moment, ShowIdleGraphs,
function LoadIdleData()
{
ShowIdleGraphs({"uuid" : window.UUID,
"loadavID" : "#loadavg-panel-div",
"loadID" : "#loadavg-panel-div",
"ctrlID" : "#ctrl-traffic-panel-div",
"exptID" : "#expt-traffic-panel-div"});
}
......
www/aptui/js/idlegraphs.js
View file @ f3f87811
This diff is collapsed.
www/aptui/js/status.js
View file @ f3f87811
......@@ -468,6 +468,10 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
if (lastStatus != "imaging") {
AutoStartSSH();
}
ShowIdleDataTab();
if (json.value.haveopenstackstats) {
CreateOpenstackTab();
}
}
else if (instanceStatus == 'failed') {
bgtype = "panel-danger";
......@@ -541,11 +545,6 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
status_html = "<font color=green>ready</font>";
}
$("#quickvm_status").html(status_html);
ShowIdleDataTab();
if (json.value.haveopenstackstats) {
CreateOpenstackTab();
}
}
//
......@@ -2619,7 +2618,7 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
};
sup.ShowWaitWait("We are gathering data from the cluster(s)");
ShowIdleGraphs({"uuid" : uuid,
"loadavID" : "#loadavg-panel-div",
"loadID" : "#loadavg-panel-div",
"ctrlID" : "#ctrl-traffic-panel-div",
"exptID" : "#expt-traffic-panel-div",
"callback" : callback});
......
www/aptui/template/adminextend.html
View file @ f3f87811
......@@ -162,10 +162,30 @@ pre {
</div>
<div id="loadavg-collapse"
class="panel-collapse collapse">
<div class='panel-body'>
<div id="loadavg-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<div style="padding-top:5px;" class='panel-body'>
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!--
So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="loadav-radio"
checked="checked" value="max"> Max
</label>
<label class="radio-inline">
<input type="radio" name="loadav-radio"
value="avg"> Avg
</label>
</div>
<div id="loadavg-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
</div>
</div>
</div>
</div>
......@@ -187,10 +207,29 @@ pre {
</div>
<div id="ctrl-traffic-collapse"
class="panel-collapse collapse traffic-collapse">
<div class='panel-body'>
<div id="ctrl-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<div class='panel-body' style="padding-top:5px;">
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!-- So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
checked="checked" value="max"> Max
</label>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
value="avg"> Avg
</label>
</div>
<div id="ctrl-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
</div>
</div>
</div>
</div>
......@@ -211,10 +250,27 @@ pre {
</div>
<div id="expt-traffic-collapse"
class="panel-collapse collapse">
<div class='panel-body'>
<div id="expt-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<div class='panel-body' style="padding-top:5px;">
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!-- So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
checked="checked" value="max"> Max</label>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
value="avg"> Avg</label>
</div>
<div id="expt-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
</div>
</div>
</div>
</div>
......
www/aptui/template/status.html
View file @ f3f87811
......@@ -19,6 +19,9 @@
pre {
white-space: pre-wrap;
}
.panel-body-nopad {
padding: 5px;
}
</style>
<div class='row'>
<div class='col-lg-6 col-lg-offset-3
......@@ -366,10 +369,29 @@ pre {
<div class="panel-heading">
<h5>Load Average Graph</h5>
</div>
<div class='panel-body'>
<div id="loadavg-chart"
<div class='panel-body panel-body-nopad'>
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!-- So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="loadav-radio"
checked="checked" value="max"> Max
</label>
<label class="radio-inline">
<input type="radio" name="loadav-radio"
value="avg"> Avg
</label>
</div>
<div id="loadavg-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<svg></svg>
</div>
</div>
</div>
</div>
......@@ -380,10 +402,29 @@ pre {
<div class="panel-heading">
<h5>Control Traffic Graph</h5>
</div>
<div class='panel-body'>
<div id="ctrl-traffic-chart"
<div class='panel-body panel-body-nopad'>
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!-- So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
checked="checked" value="max"> Max
</label>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
value="avg"> Avg
</label>
</div>
<div id="ctrl-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<svg></svg>
</div>
</div>
</div>
</div>
......@@ -394,10 +435,27 @@ pre {
<div class="panel-heading">
<h5>Experiment Traffic Graph</h5>
</div>
<div class='panel-body'>
<div id="expt-traffic-chart"
<div class='panel-body panel-body-nopad'>
<!-- The col setting gives us a "relative" position div -->
<div class='col-xs-12 col-xs-offset-0'
style="padding:0px;">
<!-- So now we can use an "absolute" position to put
the radio button in the upper left of the graph
where it will not overwrite anything.
-->
<div class="hidden toggles"
style='position:absolute;left:5px;top:0px'>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
checked="checked" value="max"> Max</label>
<label class="radio-inline">
<input type="radio" name="ctrl-radio"
value="avg"> Avg</label>
</div>
<div id="expt-traffic-chart"
class='fixedsize-panel with-3d-shadow with-transitions'>
<svg></svg>
<svg></svg>
</div>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment