-
- Build Workers:
-
+
+
+
+ Cannot load build system status. Please restart your container.
+
+
+
+
Build Queue
+
+ Running Jobs: {{ data.build.running_total }} | Total Jobs: {{ data.build.job_total }}
+
+
+
-
+
+
Local Build Workers
+
+ Local Workers: {{ data.build.workers }} | Working: {{ data.build.running_local }}
+
+
+
+
- CPU:
-
+
+
- Process Count:
-
+
- Virtual Memory:
-
+
- Swap Memory:
-
+
- Network Connections:
-
+
+
Network Connections
+
+
- Network Usage:
-
+
+
Network Usage (Bytes)
+
+
\ No newline at end of file
diff --git a/static/directives/realtime-area-chart.html b/static/directives/realtime-area-chart.html
index 553bd30b1..d42d46784 100644
--- a/static/directives/realtime-area-chart.html
+++ b/static/directives/realtime-area-chart.html
@@ -1,3 +1,6 @@
\ No newline at end of file
diff --git a/static/directives/realtime-line-chart.html b/static/directives/realtime-line-chart.html
index a99ba56c4..74e8f748c 100644
--- a/static/directives/realtime-line-chart.html
+++ b/static/directives/realtime-line-chart.html
@@ -1,3 +1,6 @@
\ No newline at end of file
diff --git a/static/js/app.js b/static/js/app.js
index dd8a2e5eb..6cc07552f 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -6602,178 +6602,6 @@ quayApp.directive('locationView', function () {
});
-quayApp.directive('realtimeAreaChart', function () {
- var directiveDefinitionObject = {
- priority: 0,
- templateUrl: '/static/directives/realtime-area-chart.html',
- replace: false,
- transclude: false,
- restrict: 'C',
- scope: {
- 'data': '=data',
- 'labels': '=labels',
- 'colors': '=colors',
- 'counter': '=counter'
- },
- controller: function($scope, $element) {
- var graph = null;
- var series = [];
- var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum14' } );
- var colors = $scope.colors || [];
-
- var setupGraph = function() {
- for (var i = 0; i < $scope.labels.length; ++i) {
- series.push({
- name: $scope.labels[i],
- color: i >= colors.length ? palette.color(): $scope.colors[i],
- stroke: 'rgba(0,0,0,0.15)',
- data: []
- });
- }
-
- graph = new Rickshaw.Graph( {
- element: $element.find('.chart')[0],
- renderer: 'area',
- stroke: true,
- series: series,
- min: 0
- });
- };
-
- var refresh = function(data) {
- if (!data || $scope.counter < 0) { return; }
- if (!graph) {
- setupGraph();
- }
-
- for (var i = 0; i < $scope.data.length; ++i) {
- series[i].data.push(
- {'x': $scope.counter, 'y': $scope.data[i] }
- );
- }
-
- hoverDetail = new Rickshaw.Graph.HoverDetail({
- graph: graph,
- xFormatter: function(x) {
- return x.toString();
- }
- });
-
- graph.renderer.unstack = true;
- graph.render();
- };
-
- $scope.$watch('counter', function() {
- refresh($scope.data_raw);
- });
-
- $scope.$watch('data', function(data) {
- $scope.data_raw = data;
- refresh($scope.data_raw);
- });
- }
- };
- return directiveDefinitionObject;
-});
-
-
-quayApp.directive('realtimeLineChart', function () {
- var directiveDefinitionObject = {
- priority: 0,
- templateUrl: '/static/directives/realtime-line-chart.html',
- replace: false,
- transclude: false,
- restrict: 'C',
- scope: {
- 'data': '=data',
- 'labels': '=labels',
- 'counter': '=counter',
- 'labelTemplate': '@labelTemplate'
- },
- controller: function($scope, $element) {
- var graph = null;
- var hoverDetail = null;
- var series = [];
- var counter = 0;
- var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum14' } );
-
- var setupGraph = function() {
- graph = new Rickshaw.Graph({
- element: $element.find('.chart')[0],
- renderer: 'line',
- series: series,
- min: 'auto',
- padding: {
- 'top': 0.1,
- 'left': 0.01,
- 'right': 0.01,
- 'bottom': 0.1
- }
- });
-
- hoverDetail = new Rickshaw.Graph.HoverDetail({
- graph: graph,
- xFormatter: function(x) {
- return x.toString();
- }
- });
- };
-
- var refresh = function(data) {
- if (!data) { return; }
- if (!graph) {
- setupGraph();
- }
-
- if (typeof data == 'number') {
- data = [data];
- }
-
- if ($scope.labels) {
- data = data.slice(0, $scope.labels.length);
- }
-
- if (series.length == 0){
- for (var i = 0; i < data.length; ++i) {
- var title = $scope.labels ? $scope.labels[i] : $scope.labelTemplate.replace('{x}', i + 1);
- series.push({
- 'color': palette.color(),
- 'data': [],
- 'name': title
- })
- }
- }
-
- counter++;
-
- for (var i = 0; i < data.length; ++i) {
- var arr = series[i].data;
- arr.push({
- 'x': counter,
- 'y': data[i]
- })
-
- if (arr.length > 10) {
- series[i].data = arr.slice(arr.length - 10, arr.length);
- }
- }
-
- graph.render();
- };
-
- $scope.$watch('counter', function(counter) {
- refresh($scope.data_raw);
- });
-
- $scope.$watch('data', function(data) {
- $scope.data_raw = data;
- });
- }
- };
- return directiveDefinitionObject;
-});
-
-
quayApp.directive('psUsageGraph', function () {
var directiveDefinitionObject = {
priority: 0,
@@ -6782,18 +6610,40 @@ quayApp.directive('psUsageGraph', function () {
transclude: false,
restrict: 'C',
scope: {
+ 'isEnabled': '=isEnabled'
},
controller: function($scope, $element) {
$scope.counter = -1;
$scope.data = null;
- var source = new EventSource('/realtime/ps');
- source.onmessage = function(e) {
- $scope.$apply(function() {
- $scope.counter++;
- $scope.data = JSON.parse(e.data);
- });
+ var source = null;
+
+ var connect = function() {
+ if (source) { return; }
+ source = new EventSource('/realtime/ps');
+ source.onmessage = function(e) {
+ $scope.$apply(function() {
+ $scope.counter++;
+ $scope.data = JSON.parse(e.data);
+ });
+ };
};
+
+ var disconnect = function() {
+ if (!source) { return; }
+ source.close();
+ source = null;
+ };
+
+ $scope.$watch('isEnabled', function(value) {
+ if (value) {
+ connect();
+ } else {
+ disconnect();
+ }
+ });
+
+ $scope.$on("$destroy", disconnect);
}
};
return directiveDefinitionObject;
diff --git a/static/js/controllers/superuser.js b/static/js/controllers/superuser.js
index ddaee7d5c..f867cd43b 100644
--- a/static/js/controllers/superuser.js
+++ b/static/js/controllers/superuser.js
@@ -17,6 +17,11 @@ function SuperUserAdminCtrl($scope, $timeout, ApiService, Features, UserService,
$scope.pollChannel = null;
$scope.logsScrolled = false;
$scope.csrf_token = encodeURIComponent(window.__token);
+ $scope.dashboardActive = false;
+
+ $scope.setDashboardActive = function(active) {
+ $scope.dashboardActive = active;
+ };
$scope.configurationSaved = function() {
$scope.requiresRestart = true;
diff --git a/static/js/core-config-setup.js b/static/js/core-config-setup.js
index 0b22da9a2..569169201 100644
--- a/static/js/core-config-setup.js
+++ b/static/js/core-config-setup.js
@@ -307,10 +307,10 @@ angular.module("core-config-setup", ['angularFileUpload'])
if (!value) { return; }
ApiService.scGetConfig().then(function(resp) {
- $scope.config = resp['config'];
+ $scope.config = resp['config'] || {};
initializeMappedLogic($scope.config);
$scope.mapped['$hasChanges'] = false;
- });
+ }, ApiService.errorDisplay('Could not load config'));
});
}
};
diff --git a/static/js/core-ui.js b/static/js/core-ui.js
index fc1ea029c..ed5e982e5 100644
--- a/static/js/core-ui.js
+++ b/static/js/core-ui.js
@@ -270,9 +270,18 @@ angular.module("core-ui", [])
'tabActive': '@tabActive',
'tabTitle': '@tabTitle',
'tabTarget': '@tabTarget',
- 'tabInit': '&tabInit'
+ 'tabInit': '&tabInit',
+ 'tabShown': '&tabShown',
+ 'tabHidden': '&tabHidden'
},
controller: function($rootScope, $scope, $element) {
+ $element.find('a[data-toggle="tab"]').on('hidden.bs.tab', function (e) {
+ $scope.tabHidden({});
+ });
+
+ $element.find('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+ $scope.tabShown({});
+ });
}
};
return directiveDefinitionObject;
@@ -297,6 +306,236 @@ angular.module("core-ui", [])
return directiveDefinitionObject;
})
+ .directive('realtimeAreaChart', function () {
+ var directiveDefinitionObject = {
+ priority: 0,
+ templateUrl: '/static/directives/realtime-area-chart.html',
+ replace: false,
+ transclude: false,
+ restrict: 'C',
+ scope: {
+ 'data': '=data',
+ 'labels': '=labels',
+ 'colors': '=colors',
+ 'counter': '=counter'
+ },
+ controller: function($scope, $element) {
+ var graph = null;
+ var series = [];
+ var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum14' } );
+ var colors = $scope.colors || [];
+
+ var setupGraph = function() {
+ for (var i = 0; i < $scope.labels.length; ++i) {
+ series.push({
+ name: $scope.labels[i],
+ color: i >= colors.length ? palette.color(): $scope.colors[i],
+ stroke: 'rgba(0,0,0,0.15)',
+ data: []
+ });
+ }
+
+ var options = {
+ element: $element.find('.chart')[0],
+ renderer: 'area',
+ stroke: true,
+ series: series,
+ min: 0,
+ padding: {
+ 'top': 0.3,
+ 'left': 0,
+ 'right': 0,
+ 'bottom': 0.3
+ }
+ };
+
+ if ($scope.minimum != null) {
+ options['min'] = $scope.minimum == 'auto' ? 'auto' : $scope.minimum * 1;
+ } else {
+ options['min'] = 0;
+ }
+
+ if ($scope.maximum != null) {
+ options['max'] = $scope.maximum == 'auto' ? 'auto' : $scope.maximum * 1;
+ }
+
+ graph = new Rickshaw.Graph(options);
+
+ xaxes = new Rickshaw.Graph.Axis.Time({
+ graph: graph,
+ timeFixture: new Rickshaw.Fixtures.Time.Local()
+ });
+
+ yaxes = new Rickshaw.Graph.Axis.Y({
+ graph: graph,
+ tickFormat: Rickshaw.Fixtures.Number.formatKMBT
+ });
+
+ hoverDetail = new Rickshaw.Graph.HoverDetail({
+ graph: graph,
+ xFormatter: function(x) {
+ return new Date(x * 1000).toString();
+ }
+ });
+ };
+
+ var refresh = function(data) {
+ if (!data || $scope.counter < 0) { return; }
+ if (!graph) {
+ setupGraph();
+ }
+
+ var timecode = new Date().getTime() / 1000;
+ for (var i = 0; i < $scope.data.length; ++i) {
+ var arr = series[i].data;
+ arr.push(
+ {'x': timecode, 'y': $scope.data[i] }
+ );
+
+ if (arr.length > 10) {
+ series[i].data = arr.slice(arr.length - 10, arr.length);
+ }
+ }
+
+ graph.renderer.unstack = true;
+ graph.update();
+ };
+
+ $scope.$watch('counter', function() {
+ refresh($scope.data_raw);
+ });
+
+ $scope.$watch('data', function(data) {
+ $scope.data_raw = data;
+ refresh($scope.data_raw);
+ });
+ }
+ };
+ return directiveDefinitionObject;
+ })
+
+
+ .directive('realtimeLineChart', function () {
+ var directiveDefinitionObject = {
+ priority: 0,
+ templateUrl: '/static/directives/realtime-line-chart.html',
+ replace: false,
+ transclude: false,
+ restrict: 'C',
+ scope: {
+ 'data': '=data',
+ 'labels': '=labels',
+ 'counter': '=counter',
+ 'labelTemplate': '@labelTemplate',
+ 'minimum': '@minimum',
+ 'maximum': '@maximum'
+ },
+ controller: function($scope, $element) {
+ var graph = null;
+ var xaxes = null;
+ var yaxes = null;
+ var hoverDetail = null;
+ var series = [];
+ var counter = 0;
+ var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum14' } );
+
+ var setupGraph = function() {
+ var options = {
+ element: $element.find('.chart')[0],
+ renderer: 'line',
+ series: series,
+ padding: {
+ 'top': 0.3,
+ 'left': 0,
+ 'right': 0,
+ 'bottom': 0.3
+ }
+ };
+
+ if ($scope.minimum != null) {
+ options['min'] = $scope.minimum == 'auto' ? 'auto' : $scope.minimum * 1;
+ } else {
+ options['min'] = 0;
+ }
+
+ if ($scope.maximum != null) {
+ options['max'] = $scope.maximum == 'auto' ? 'auto' : $scope.maximum * 1;
+ }
+
+ graph = new Rickshaw.Graph(options);
+ xaxes = new Rickshaw.Graph.Axis.Time({
+ graph: graph,
+ timeFixture: new Rickshaw.Fixtures.Time.Local()
+ });
+
+ yaxes = new Rickshaw.Graph.Axis.Y({
+ graph: graph,
+ tickFormat: Rickshaw.Fixtures.Number.formatKMBT
+ });
+
+ hoverDetail = new Rickshaw.Graph.HoverDetail({
+ graph: graph,
+ xFormatter: function(x) {
+ return new Date(x * 1000).toString();
+ }
+ });
+ };
+
+ var refresh = function(data) {
+ if (data == null) { return; }
+ if (!graph) {
+ setupGraph();
+ }
+
+ if (typeof data == 'number') {
+ data = [data];
+ }
+
+ if ($scope.labels) {
+ data = data.slice(0, $scope.labels.length);
+ }
+
+ if (series.length == 0){
+ for (var i = 0; i < data.length; ++i) {
+ var title = $scope.labels ? $scope.labels[i] : $scope.labelTemplate.replace('{x}', i + 1);
+ series.push({
+ 'color': palette.color(),
+ 'data': [],
+ 'name': title
+ })
+ }
+ }
+
+ counter++;
+ var timecode = new Date().getTime() / 1000;
+
+ for (var i = 0; i < data.length; ++i) {
+ var arr = series[i].data;
+ arr.push({
+ 'x': timecode,
+ 'y': data[i]
+ })
+
+ if (arr.length > 10) {
+ series[i].data = arr.slice(arr.length - 10, arr.length);
+ }
+ }
+
+ graph.update();
+ };
+
+ $scope.$watch('counter', function(counter) {
+ refresh($scope.data_raw);
+ });
+
+ $scope.$watch('data', function(data) {
+ $scope.data_raw = data;
+ });
+ }
+ };
+ return directiveDefinitionObject;
+ })
+
.directive('corStepBar', function() {
var directiveDefinitionObject = {
priority: 4,
diff --git a/static/partials/super-user.html b/static/partials/super-user.html
index 2e72bfe85..6d150634d 100644
--- a/static/partials/super-user.html
+++ b/static/partials/super-user.html
@@ -20,7 +20,8 @@
tab-target="#users" tab-init="loadUsers()">
-
+
@@ -47,7 +48,7 @@