1
0
Fork 0
This commit is contained in:
hkernbach 2016-05-12 16:40:05 +02:00
parent 8776c63f67
commit 75e2542f66
12 changed files with 68 additions and 28 deletions

View File

@ -14321,7 +14321,7 @@ window.ArangoUsers = Backbone.Collection.extend({
initialize: function(models, options) {
this.host = options.host;
window.App.registerForUpdate(this);
//window.App.registerForUpdate(this);
},
statusClass: function(s) {
@ -14378,6 +14378,9 @@ window.ArangoUsers = Backbone.Collection.extend({
res[addr].dbs.push(m);
});
callback(res);
}).error(function(e) {
console.log("error");
console.log(e);
});
},
@ -15521,6 +15524,7 @@ window.ArangoUsers = Backbone.Collection.extend({
events: {
},
statsEnabled: false,
historyInit: false,
initDone: false,
interval: 5000,
@ -15872,13 +15876,18 @@ window.ArangoUsers = Backbone.Collection.extend({
initGraphs: function() {
var self = this;
var noData = 'Fetching data...';
if (self.statsEnabled === false) {
noData = 'Statistics disabled.';
}
_.each(self.chartsOptions, function(c) {
nv.addGraph(function() {
self.charts[c.id] = nv.models.stackedAreaChart()
.options({
useInteractiveGuideline: true,
showControls: false,
noData: 'Fetching data...',
noData: noData,
duration: 0
});
@ -15958,6 +15967,11 @@ window.ArangoUsers = Backbone.Collection.extend({
},
rerenderGraphs: function(input) {
if (!this.statsEnabled) {
return;
}
var self = this, data, lines;
this.formatDataForGraph(input);
@ -16033,6 +16047,13 @@ window.ArangoUsers = Backbone.Collection.extend({
var counter = 0, counter2;
_.each(data, function(stat) {
if (stat.enabled) {
self.statsEnabled = true;
}
else {
self.statsEnabled = false;
}
if (typeof stat === 'object') {
if (counter === 0) {
//one time value
@ -18044,7 +18065,13 @@ window.ArangoUsers = Backbone.Collection.extend({
$.ajax(
url + urlParams,
{async: true}
{
async: true,
xhrFields: {
withCredentials: true
},
crossDomain: true
}
).done(
function (d) {
if (d.times.length > 0) {
@ -18058,6 +18085,9 @@ window.ArangoUsers = Backbone.Collection.extend({
callback(d.enabled, modalView);
}
self.updateCharts();
}).error(function(e) {
console.log("stat fetch req error");
console.log(e);
});
this.getReplicationStatistics();
@ -18362,9 +18392,16 @@ window.ArangoUsers = Backbone.Collection.extend({
if (!enabled) {
$(this.el).html('');
if (this.server) {
$(this.el).append(
'<div style="color: red">Server statistics (' + this.server + ') are disabled.</div>'
);
}
else {
$(this.el).append(
'<div style="color: red">Server statistics are disabled.</div>'
);
}
return;
}
@ -23453,12 +23490,12 @@ window.ArangoUsers = Backbone.Collection.extend({
var callback = function() {
this.continueRender();
this.breadcrumb(this.coordname);
window.arangoHelper.buildNodeSubNav(this.coordname, 'Dashboard', 'Logs');
//window.arangoHelper.buildNodeSubNav(this.coordname, 'Dashboard', 'Logs');
$(window).trigger('resize');
}.bind(this);
var cb =function() {
console.log("dummy");
var cb = function() {
console.log("node complete");
};
if (!this.initCoordDone) {
@ -23527,7 +23564,6 @@ window.ArangoUsers = Backbone.Collection.extend({
}
});
console.log(self.dbServer.toJSON());
callback();
}
}, 200);
@ -23554,6 +23590,7 @@ window.ArangoUsers = Backbone.Collection.extend({
knownServers: [],
events: {
"click .pure-table-body .pure-table-row" : "navigateToNode"
},
initialize: function (options) {
@ -23564,10 +23601,6 @@ window.ArangoUsers = Backbone.Collection.extend({
this.updateServerTime();
this.toRender = options.toRender;
if (this.toRender !== 'coordinator') {
this.events["click .pure-table-body .pure-table-row"] = "navigateToNode";
}
//start polling with interval
window.setInterval(function() {
if (window.location.hash === '#cNodes' || window.location.hash === '#dNodes') {
@ -23581,11 +23614,17 @@ window.ArangoUsers = Backbone.Collection.extend({
},
navigateToNode: function(elem) {
if (window.location.hash === '#dNodes') {
return;
}
var name = $(elem.currentTarget).attr('node');
window.App.navigate("#node/" + encodeURIComponent(name), {trigger: true});
},
render: function () {
window.arangoHelper.buildNodesSubNav(this.toRender);
var callback = function() {

File diff suppressed because one or more lines are too long

View File

@ -3030,4 +3030,4 @@ var cutByResolution = function (str) {
</div>
<div id="workMonitorContent" class="innerContent">
</div></script></head><body><nav class="navbar"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"></a> <a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a> <a class="version"><span>VERSION:</span><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1462977807593"></script><script src="app.js?version=1462977807593"></script></body></html>
</div></script></head><body><nav class="navbar"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"></a> <a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a> <a class="version"><span>VERSION:</span><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1463060370768"></script><script src="app.js?version=1463060370768"></script></body></html>

View File

@ -3388,8 +3388,8 @@ var cutByResolution = function (str) {
</div>
</div>
<script src="libs.js?version=1462977807593"></script>
<script src="app.js?version=1462977807593"></script>
<script src="libs.js?version=1463060370768"></script>
<script src="app.js?version=1463060370768"></script>
</body>
</html>

View File

@ -25888,7 +25888,7 @@ var AqlHighlightRules = function() {
);
var builtinFunctions = (
"(to_bool|to_number|to_string|to_list|is_null|is_bool|is_number|is_string|is_list|is_document|" +
"(to_bool|to_number|to_string|to_list|is_null|is_bool|is_number|is_string|is_list|is_document|typename|" +
"concat|concat_separator|char_length|lower|upper|substring|left|right|trim|reverse|contains|" +
"like|floor|ceil|round|abs|rand|sqrt|pow|length|min|max|average|sum|median|variance_population|" +
"variance_sample|first|last|unique|matches|merge|merge_recursive|has|attributes|values|unset|unset_recursive|keep|" +
@ -25903,7 +25903,7 @@ var AqlHighlightRules = function() {
"date_add|date_subtract|date_diff|date_compare|date_format|fail|passthru|sleep|not_null|" +
"first_list|first_document|parse_identifier|current_user|current_database|" +
"collections|document|union|union_distinct|intersection|flatten|is_same_collection|" +
"ltrim|rtrim|find_first|find_last|split|substitute|md5|sha1|random_token|AQL_LAST_ENTRY)"
"ltrim|rtrim|find_first|find_last|split|substitute|md5|sha1|hash|random_token|AQL_LAST_ENTRY)"
);
var keywordMapper = this.createKeywordMapper({

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,2 @@
<script src="libs.js?version=1462977807593"></script>
<script src="app.js?version=1462977807593"></script>
<script src="libs.js?version=1463060370768"></script>
<script src="app.js?version=1463060370768"></script>