@@ -145,6 +159,7 @@
Service specification
+
diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js
index a69c2fb78..b61dbb256 100644
--- a/app/components/service/serviceController.js
+++ b/app/components/service/serviceController.js
@@ -1,6 +1,6 @@
angular.module('service', [])
-.controller('ServiceController', ['$q', '$scope', '$stateParams', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'Secret', 'SecretHelper', 'Service', 'ServiceHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService', 'ControllerDataPipeline',
-function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll, ServiceService, Secret, SecretHelper, Service, ServiceHelper, TaskService, NodeService, Notifications, Pagination, ModalService, ControllerDataPipeline) {
+.controller('ServiceController', ['$q', '$scope', '$stateParams', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'Secret', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService',
+function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll, ServiceService, Secret, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, Notifications, Pagination, ModalService) {
$scope.state = {};
$scope.state.pagination_count = Pagination.getPaginationCount('service_tasks');
@@ -124,10 +124,24 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
updateServiceArray(service, 'ServiceConstraints', service.ServiceConstraints);
}
};
- $scope.updatePlacementConstraint = function updatePlacementConstraint(service, constraint) {
+ $scope.updatePlacementConstraint = function(service, constraint) {
updateServiceArray(service, 'ServiceConstraints', service.ServiceConstraints);
};
+ $scope.addPlacementPreference = function(service) {
+ service.ServicePreferences.push({ strategy: 'spread', value: '' });
+ updateServiceArray(service, 'ServicePreferences', service.ServicePreferences);
+ };
+ $scope.removePlacementPreference = function(service, index) {
+ var removedElement = service.ServicePreferences.splice(index, 1);
+ if (removedElement !== null) {
+ updateServiceArray(service, 'ServicePreferences', service.ServicePreferences);
+ }
+ };
+ $scope.updatePlacementPreference = function(service, constraint) {
+ updateServiceArray(service, 'ServicePreferences', service.ServicePreferences);
+ };
+
$scope.addPublishedPort = function addPublishedPort(service) {
if (!service.Ports) {
service.Ports = [];
@@ -174,9 +188,9 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
$('#loadingViewSpinner').show();
var config = ServiceHelper.serviceToConfig(service.Model);
config.Name = service.Name;
- config.Labels = translateServiceLabelsToLabels(service.ServiceLabels);
- config.TaskTemplate.ContainerSpec.Env = translateEnvironmentVariablesToEnv(service.EnvironmentVariables);
- config.TaskTemplate.ContainerSpec.Labels = translateServiceLabelsToLabels(service.ServiceContainerLabels);
+ config.Labels = LabelHelper.fromKeyValueToLabelHash(service.ServiceLabels);
+ config.TaskTemplate.ContainerSpec.Env = ServiceHelper.translateEnvironmentVariablesToEnv(service.EnvironmentVariables);
+ config.TaskTemplate.ContainerSpec.Labels = LabelHelper.fromKeyValueToLabelHash(service.ServiceContainerLabels);
config.TaskTemplate.ContainerSpec.Image = service.Image;
config.TaskTemplate.ContainerSpec.Secrets = service.ServiceSecrets ? service.ServiceSecrets.map(SecretHelper.secretConfig) : [];
@@ -188,6 +202,7 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
config.TaskTemplate.Placement = {};
}
config.TaskTemplate.Placement.Constraints = ServiceHelper.translateKeyValueToPlacementConstraints(service.ServiceConstraints);
+ config.TaskTemplate.Placement.Preferences = ServiceHelper.translateKeyValueToPlacementPreferences(service.ServicePreferences);
config.TaskTemplate.Resources = {
Limits: {
@@ -263,11 +278,12 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
function translateServiceArrays(service) {
service.ServiceSecrets = service.Secrets ? service.Secrets.map(SecretHelper.flattenSecret) : [];
- service.EnvironmentVariables = translateEnvironmentVariables(service.Env);
- service.ServiceLabels = translateLabelsToServiceLabels(service.Labels);
- service.ServiceContainerLabels = translateLabelsToServiceLabels(service.ContainerLabels);
+ service.EnvironmentVariables = ServiceHelper.translateEnvironmentVariables(service.Env);
+ service.ServiceLabels = LabelHelper.fromLabelHashToKeyValue(service.Labels);
+ service.ServiceContainerLabels = LabelHelper.fromLabelHashToKeyValue(service.ContainerLabels);
service.ServiceMounts = angular.copy(service.Mounts);
- service.ServiceConstraints = translateConstraintsToKeyValue(service.Constraints);
+ service.ServiceConstraints = ServiceHelper.translateConstraintsToKeyValue(service.Constraints);
+ service.ServicePreferences = ServiceHelper.translatePreferencesToKeyValue(service.Preferences);
}
function initView() {
@@ -283,7 +299,6 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
translateServiceArrays(service);
$scope.service = service;
- ControllerDataPipeline.setAccessControlData('service', $stateParams.id, service.ResourceControl);
originalService = angular.copy(service);
return $q.all({
@@ -310,7 +325,6 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
Notifications.error('Failure', err, 'Unable to retrieve service details');
})
.finally(function final() {
-
$('#loadingViewSpinner').hide();
});
}
@@ -341,80 +355,5 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
service.hasChanges = true;
}
- function translateEnvironmentVariables(env) {
- if (env) {
- var variables = [];
- env.forEach(function(variable) {
- var idx = variable.indexOf('=');
- var keyValue = [variable.slice(0,idx), variable.slice(idx+1)];
- var originalValue = (keyValue.length > 1) ? keyValue[1] : '';
- variables.push({ key: keyValue[0], value: originalValue, originalKey: keyValue[0], originalValue: originalValue, added: true});
- });
- return variables;
- }
- return [];
- }
- function translateEnvironmentVariablesToEnv(env) {
- if (env) {
- var variables = [];
- env.forEach(function(variable) {
- if (variable.key && variable.key !== '') {
- variables.push(variable.key + '=' + variable.value);
- }
- });
- return variables;
- }
- return [];
- }
-
- function translateLabelsToServiceLabels(Labels) {
- var labels = [];
- if (Labels) {
- Object.keys(Labels).forEach(function(key) {
- labels.push({ key: key, value: Labels[key], originalKey: key, originalValue: Labels[key], added: true});
- });
- }
- return labels;
- }
- function translateServiceLabelsToLabels(labels) {
- var Labels = {};
- if (labels) {
- labels.forEach(function(label) {
- Labels[label.key] = label.value;
- });
- }
- return Labels;
- }
-
- function translateConstraintsToKeyValue(constraints) {
- function getOperator(constraint) {
- var indexEquals = constraint.indexOf('==');
- if (indexEquals >= 0) {
- return [indexEquals, '=='];
- }
- return [constraint.indexOf('!='), '!='];
- }
- if (constraints) {
- var keyValueConstraints = [];
- constraints.forEach(function(constraint) {
- var operatorIndices = getOperator(constraint);
-
- var key = constraint.slice(0, operatorIndices[0]);
- var operator = operatorIndices[1];
- var value = constraint.slice(operatorIndices[0] + 2);
-
- keyValueConstraints.push({
- key: key,
- value: value,
- operator: operator,
- originalKey: key,
- originalValue: value
- });
- });
- return keyValueConstraints;
- }
- return [];
- }
-
initView();
}]);
diff --git a/app/components/serviceLogs/serviceLogsController.js b/app/components/serviceLogs/serviceLogsController.js
new file mode 100644
index 000000000..9895bbb6e
--- /dev/null
+++ b/app/components/serviceLogs/serviceLogsController.js
@@ -0,0 +1,83 @@
+angular.module('serviceLogs', [])
+.controller('ServiceLogsController', ['$scope', '$stateParams', '$anchorScroll', 'ServiceLogs', 'Service',
+function ($scope, $stateParams, $anchorScroll, ServiceLogs, Service) {
+ $scope.state = {};
+ $scope.state.displayTimestampsOut = false;
+ $scope.state.displayTimestampsErr = false;
+ $scope.stdout = '';
+ $scope.stderr = '';
+ $scope.tailLines = 2000;
+
+ function getLogs() {
+ $('#loadingViewSpinner').show();
+ getLogsStdout();
+ getLogsStderr();
+ $('#loadingViewSpinner').hide();
+ }
+
+ function getLogsStderr() {
+ ServiceLogs.get($stateParams.id, {
+ stdout: 0,
+ stderr: 1,
+ timestamps: $scope.state.displayTimestampsErr,
+ tail: $scope.tailLines
+ }, function (data, status, headers, config) {
+ // Replace carriage returns with newlines to clean up output
+ data = data.replace(/[\r]/g, '\n');
+ // Strip 8 byte header from each line of output
+ data = data.substring(8);
+ data = data.replace(/\n(.{8})/g, '\n');
+ $scope.stderr = data;
+ });
+ }
+
+ function getLogsStdout() {
+ ServiceLogs.get($stateParams.id, {
+ stdout: 1,
+ stderr: 0,
+ timestamps: $scope.state.displayTimestampsOut,
+ tail: $scope.tailLines
+ }, function (data, status, headers, config) {
+ // Replace carriage returns with newlines to clean up output
+ data = data.replace(/[\r]/g, '\n');
+ // Strip 8 byte header from each line of output
+ data = data.substring(8);
+ data = data.replace(/\n(.{8})/g, '\n');
+ $scope.stdout = data;
+ });
+ }
+
+ function getService() {
+ $('#loadingViewSpinner').show();
+ Service.get({id: $stateParams.id}, function (d) {
+ $scope.service = d;
+ $('#loadingViewSpinner').hide();
+ }, function (e) {
+ Notifications.error('Failure', e, 'Unable to retrieve service info');
+ $('#loadingViewSpinner').hide();
+ });
+ }
+
+ function initView() {
+ getService();
+ getLogs();
+
+ var logIntervalId = window.setInterval(getLogs, 5000);
+
+ $scope.$on('$destroy', function () {
+ // clearing interval when view changes
+ clearInterval(logIntervalId);
+ });
+
+ $scope.toggleTimestampsOut = function () {
+ getLogsStdout();
+ };
+
+ $scope.toggleTimestampsErr = function () {
+ getLogsStderr();
+ };
+ }
+
+ initView();
+
+}]);
diff --git a/app/components/serviceLogs/servicelogs.html b/app/components/serviceLogs/servicelogs.html
new file mode 100644
index 000000000..3bbe090e2
--- /dev/null
+++ b/app/components/serviceLogs/servicelogs.html
@@ -0,0 +1,56 @@
+
+
+
+
+
+ Services > {{ service.Spec.Name }} > Logs
+
+
+
+
+
+
+
+
+
+
+ {{ service.Spec.Name }}
+
+
+
+
+
+
+
+
+
diff --git a/app/components/services/services.html b/app/components/services/services.html
index 945c6db40..3b373937a 100644
--- a/app/components/services/services.html
+++ b/app/components/services/services.html
@@ -128,6 +128,6 @@
-