diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
index 37fd496349..76dcf08323 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
@@ -8,7 +8,7 @@ export default ['templateUrl',
restrict: 'E',
link: function(scope) {
scope.$watch('capacity', function() {
- scope.PercentRemainingStyle = {
+ scope.CapacityStyle = {
'flex-grow': scope.capacity * 0.01
};
}, true);
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
index aac4ccd7b0..b1b925fb06 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
@@ -1,4 +1,4 @@
-
Capacity
+
Used Capacity
{{ instanceGroupCapacity }}%
diff --git a/awx/ui/client/src/instance-groups/instance-groups.list.js b/awx/ui/client/src/instance-groups/instance-groups.list.js
index 37eaf0d23d..6d22e6cd39 100644
--- a/awx/ui/client/src/instance-groups/instance-groups.list.js
+++ b/awx/ui/client/src/instance-groups/instance-groups.list.js
@@ -18,7 +18,7 @@ export default ['i18n', function(i18n) {
uiSref: 'instanceGroups.instances.list({instance_group_id: instance_group.id})',
ngClass: "{'isActive' : isActive()}"
},
- percent_capacity_remaining: {
+ consumed_capacity: {
label: i18n._('Capacity'),
nosort: true,
},
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
index 163a2e25fe..6076c7f886 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html
@@ -7,7 +7,7 @@
-
Capacity
+
Used Capacity
{{ instanceCapacity }}%
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
index 73af9259b5..def896523a 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
@@ -12,7 +12,7 @@ export default {
templateUrl: templateUrl('./instance-groups/instances/instance-jobs/instance-jobs'),
controller: function($scope, $rootScope, instance) {
$scope.instanceName = instance.hostname;
- $scope.instanceCapacity = instance.percent_capacity_remaining;
+ $scope.instanceCapacity = instance.consumed_capacity;
$scope.instanceJobsRunning = instance.jobs_running;
$rootScope.breadcrumb.instance_name = instance.hostname;
}
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index aa1f2daef8..fa408780b6 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -15,27 +15,28 @@
"{{'Name' | translate}}"
-
- Capacity
- |
+
|
- {{ instance.hostname }} |
-
- {{ instance.percent_capacity_remaining }}%
+ {{ instance.hostname }}
|
{{ instance.jobs_running }}
|
+
+ {{ instance.consumed_capacity }}%
+ |
diff --git a/awx/ui/client/src/instance-groups/instances/instances.list.js b/awx/ui/client/src/instance-groups/instances/instances.list.js
index b3966884d8..048279d6c8 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.list.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.list.js
@@ -16,7 +16,7 @@ export default ['i18n', function(i18n) {
modalColumnClass: 'col-md-8',
uiSref: 'instanceGroups.instances.list.job({instance_id: instance.id})'
},
- percent_capacity_remaining: {
+ consumed_capacity: {
label: i18n._('Capacity'),
nosort: true,
},
diff --git a/awx/ui/client/src/instance-groups/instances/instances.route.js b/awx/ui/client/src/instance-groups/instances/instances.route.js
index 0662052c67..43153cb9fc 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.route.js
@@ -9,7 +9,7 @@ export default {
templateUrl: templateUrl('./instance-groups/instance-group'),
controller: function($scope, $rootScope, instanceGroup) {
$scope.instanceGroupName = instanceGroup.name;
- $scope.instanceGroupCapacity = instanceGroup.percent_capacity_remaining;
+ $scope.instanceGroupCapacity = instanceGroup.consumed_capacity;
$scope.instanceGroupJobsRunning = instanceGroup.jobs_running;
$rootScope.breadcrumb.instance_group_name = instanceGroup.name;
}
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 51e9b7976d..1a5f8bad1a 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -26,12 +26,12 @@
"{{'Name' | translate}}"
-
- Capacity
- |
+
@@ -41,14 +41,14 @@
{{ instance_group.name }}
{{ instance_group.instances }}
-
- {{ instance_group.percent_capacity_remaining }}%
- |
{{ instance_group.jobs_running }}
|
+
+ {{ instance_group.consumed_capacity }}%
+ |
diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
index 0b579a1135..5a993c8dfe 100644
--- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
+++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
@@ -52,7 +52,7 @@ export default ['templateUrl', '$window', function(templateUrl, $window) {
};
instanceGroupList.fields.name.ngClick = "linkoutInstanceGroup(instance_group)";
instanceGroupList.fields.name.columnClass = 'col-md-11 col-sm-11 col-xs-11';
- delete instanceGroupList.fields.percent_capacity_remaining;
+ delete instanceGroupList.fields.consumed_capacity;
delete instanceGroupList.fields.jobs_running;
let html = `${GenerateList.build({